From 6206fb92ef0158a6294d6f232dec20b8ad9f815f2d29fef85226f3390d0ce4ff Mon Sep 17 00:00:00 2001 From: nick wang Date: Mon, 11 May 2020 13:40:11 +0000 Subject: [PATCH] Accepting request 802615 from network:ha-clustering:Unstable bsc#1171419, 9.13.0 OBS-URL: https://build.opensuse.org/request/show/802615 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=92 --- _service | 4 +- crm-fence-peer-pacemaker2.patch | 86 --------------------------------- drbd-utils-9.12.0.tar.gz | 3 -- drbd-utils-9.13.0.tar.gz | 3 ++ drbd-utils.changes | 15 +++++- drbd-utils.spec | 4 +- 6 files changed, 20 insertions(+), 95 deletions(-) delete mode 100644 crm-fence-peer-pacemaker2.patch delete mode 100644 drbd-utils-9.12.0.tar.gz create mode 100644 drbd-utils-9.13.0.tar.gz diff --git a/_service b/_service index a408ab7..d6719a7 100644 --- a/_service +++ b/_service @@ -5,10 +5,10 @@ drbd-utils - 9.12.0+git.%h + 9.13.0+git.%h master diff --git a/crm-fence-peer-pacemaker2.patch b/crm-fence-peer-pacemaker2.patch deleted file mode 100644 index 58d0647..0000000 --- a/crm-fence-peer-pacemaker2.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit fd2eec6eca91e3d4d24852b5bac4dd61f9854e67 -Author: Lars Ellenberg -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 ' 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 :( -+ -+ # 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 '// { -- // { -+ /<$clone_or_master / h;"' - / :( -+ -+ # 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 '// { -- // { -+ /<$clone_or_master / h;"' - / + +- bsc#1171419, Update to 9.13.0 + * crm-fence-peer{,.9}.sh: detect Pacemaker 2 promotable clones + * submodules: switch to https, which makes it easier to clone + if you are behind some weird company firewalls. + * drbd.service: start pacemaker before drbd-proxy + * windrbd: various new commands including create-resource-from-url, + set-syslog-ip, scan-partitions-for-minor, install-bus-device, + remove-bus-device +- Remove patch crm-fence-peer-pacemaker2.patch + ------------------------------------------------------------------- Tue Mar 10 09:10:40 UTC 2020 - nick wang @@ -206,7 +219,7 @@ Wed Dec 6 07:19:50 UTC 2017 - nwang@suse.com Mon Oct 16 09:38:35 UTC 2017 - nwang@suse.com - bsc#1061145, fencing is moved from disk secion to net - Add move_fencing_from_disk_to_net_in_example.patch + Add move_fencing_from_disk_to_net_in_example.patch - bsc#1061147, skip running drbdadm sh-b-pri in drbd9 Add skip_sh-b-pri_in_v9.patch diff --git a/drbd-utils.spec b/drbd-utils.spec index 64d31ef..bc21716 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -22,7 +22,7 @@ %bcond_without prebuiltman Name: drbd-utils -Version: 9.12.0 +Version: 9.13.0 Release: 0 Summary: Distributed Replicated Block Device License: GPL-2.0-or-later @@ -36,7 +36,6 @@ Patch3: fence-after-pacemaker-down.patch # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142) Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch Patch5: move_fencing_from_disk_to_net_in_example.patch -Patch6: crm-fence-peer-pacemaker2.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -87,7 +86,6 @@ raid 1. It is a building block for setting up clusters. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build export WANT_DRBD_REPRODUCIBLE_BUILD=1