6 Star 0 Fork 6

src-openEuler/drbd

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-drbd.ocf-the-text-output-of-crm_resource-locate-has-.patch 1.09 KB
一键复制 编辑 原始数据 按行查看 历史
twtlpl 提交于 2024-12-19 10:57 +08:00 . drbd.ocf: explicitly timeout crm_master IPC early
From 0a014f290802e0221d06bb52a74c2e29f11ef02e Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Fri, 6 Dec 2024 15:35:58 +0100
Subject: [PATCH 4/4] drbd.ocf: the text output of "crm_resource --locate" has
changed
"Recent" Pacemaker reports "Promoted" instead of "Master" for promoted resources.
Recognize that.
This change was made quite a while ago, but the resource agent parameter
remove_master_score_if_peer_primary=unexpected
is little known and rarely in use, so no-one noticed.
---
scripts/drbd.ocf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/drbd.ocf b/scripts/drbd.ocf
index c3185834..34d208f2 100755
--- a/scripts/drbd.ocf
+++ b/scripts/drbd.ocf
@@ -1021,7 +1021,7 @@ crm_resource_locate_master()
called_crm_resource_locate=true
DRBD_PRIMARY_PEER_according_to_pcmk=$(
crm_resource --resource "$OCF_RESOURCE_INSTANCE" --locate 2>/dev/null |
- sed -ne 's/^.*is running on: \([^ ]*\) Master.*$/\1/p' |
+ sed -ne 's/^.*is running on: \([^ ]*\) \(Master\|Promoted\).*$/\1/p' |
grep -vix -m1 -e "$HOSTNAME")
}
--
2.33.1.windows.1
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/src-openeuler/drbd.git
git@gitee.com:src-openeuler/drbd.git
src-openeuler
drbd
drbd
master

搜索帮助

371d5123 14472233 46e8bd33 14472233