224d8a1f53
bsc#1166200 OBS-URL: https://build.opensuse.org/request/show/783587 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=90
87 lines
3.5 KiB
Diff
87 lines
3.5 KiB
Diff
commit fd2eec6eca91e3d4d24852b5bac4dd61f9854e67
|
|
Author: Lars Ellenberg <lars.ellenberg@linbit.com>
|
|
Date: Mon Mar 2 14:12:55 2020 +0100
|
|
|
|
crm-fence-peer: detect pacemaker 2 "promotable clones"
|
|
|
|
The sed-script to guess the pacemaker xml-id to be used in location
|
|
constraints from the DRBD resource name expected '<master' tags, but
|
|
with new pacemaker 2 xml, these are '<clone's, with "promotable=true"
|
|
set in the meta attributes.
|
|
|
|
Use the crm_feature_set version from the top level <cib/> tag
|
|
to decide between the two.
|
|
|
|
diff --git a/scripts/crm-fence-peer.9.sh b/scripts/crm-fence-peer.9.sh
|
|
index 94c32747..26b67b9e 100755
|
|
--- a/scripts/crm-fence-peer.9.sh
|
|
+++ b/scripts/crm-fence-peer.9.sh
|
|
@@ -197,15 +197,28 @@ fence_peer_init()
|
|
{
|
|
# we know which instance we are: $OCF_RESOURCE_INSTANCE.
|
|
# but we do not know the xml ID of the <master/> :(
|
|
+
|
|
+ # with Pacemaker 2, its "promotable clones" instead of the
|
|
+ # "master" (which was deemed a bad naming choice).
|
|
+ # detect older pacemaker by crm_feature_set < 3.1.0
|
|
+ local clone_or_master=clone
|
|
+ case $crm_feature_set in
|
|
+ 3.0.*|[012].*) : "pacemaker version < 2, master slave"
|
|
+ clone_or_master=master ;;
|
|
+ esac
|
|
+
|
|
# cibadmin -Ql --xpath \
|
|
# '//master[primitive[@type="drbd" and instance_attributes/nvpair[@name = "drbd_resource" and @value="r0"]]]/@id'
|
|
# but I'd have to pipe that through sed anyways, because @attribute
|
|
# xpath queries are not supported.
|
|
# and I'd be incompatible with older cibadmin not supporting --xpath.
|
|
- # be cool, sed it out:
|
|
+ # be cool, sed it out.
|
|
+ # I could be more strict about primitive class:provider:type,
|
|
+ # or double check that it is in fact a promotable="true" clone...
|
|
+ # But in the real world, this is good enough.
|
|
: ${master_id=$(set +x; echo "$cib_xml" |
|
|
- sed -ne '/<master /,/<\/master>/ {
|
|
- /<master / h;
|
|
+ sed -ne "/<$clone_or_master /,/<\\/$clone_or_master>/ {
|
|
+ /<$clone_or_master / h;"'
|
|
/<primitive/,/<\/primitive/ {
|
|
/<instance_attributes/,/<\/instance_attributes/ {
|
|
/<nvpair .*\bname="drbd_resource"/ {
|
|
diff --git a/scripts/crm-fence-peer.sh b/scripts/crm-fence-peer.sh
|
|
index 513773fe..b7b62cfd 100755
|
|
--- a/scripts/crm-fence-peer.sh
|
|
+++ b/scripts/crm-fence-peer.sh
|
|
@@ -51,15 +51,28 @@ fence_peer_init()
|
|
{
|
|
# we know which instance we are: $OCF_RESOURCE_INSTANCE.
|
|
# but we do not know the xml ID of the <master/> :(
|
|
+
|
|
+ # with Pacemaker 2, its "promotable clones" instead of the
|
|
+ # "master" (which was deemed a bad naming choice).
|
|
+ # detect older pacemaker by crm_feature_set < 3.1.0
|
|
+ local clone_or_master=clone
|
|
+ case $crm_feature_set in
|
|
+ 3.0.*|[012].*) : "pacemaker version < 2, master slave"
|
|
+ clone_or_master=master ;;
|
|
+ esac
|
|
+
|
|
# cibadmin -Ql --xpath \
|
|
# '//master[primitive[@type="drbd" and instance_attributes/nvpair[@name = "drbd_resource" and @value="r0"]]]/@id'
|
|
# but I'd have to pipe that through sed anyways, because @attribute
|
|
# xpath queries are not supported.
|
|
# and I'd be incompatible with older cibadmin not supporting --xpath.
|
|
- # be cool, sed it out:
|
|
+ # be cool, sed it out.
|
|
+ # I could be more strict about primitive class:provider:type,
|
|
+ # or double check that it is in fact a promotable="true" clone...
|
|
+ # But in the real world, this is good enough.
|
|
: ${master_id=$(set +x; echo "$cib_xml" |
|
|
- sed -ne '/<master /,/<\/master>/ {
|
|
- /<master / h;
|
|
+ sed -ne "/<$clone_or_master /,/<\\/$clone_or_master>/ {
|
|
+ /<$clone_or_master / h;"'
|
|
/<primitive/,/<\/primitive/ {
|
|
/<instance_attributes/,/<\/instance_attributes/ {
|
|
/<nvpair .*\bname="drbd_resource"/ {
|