Hello community, here is the log from the commit of package drbd-utils for openSUSE:Leap:15.2 checked in at 2020-03-13 10:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/drbd-utils (Old) and /work/SRC/openSUSE:Leap:15.2/.drbd-utils.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils" Fri Mar 13 10:59:34 2020 rev:28 rq:784261 version:9.12.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/drbd-utils/drbd-utils.changes 2020-01-15 14:53:04.409511251 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.drbd-utils.new.3160/drbd-utils.changes 2020-03-13 11:01:40.392618548 +0100 @@ -1,0 +2,38 @@ +Tue Mar 10 09:10:40 UTC 2020 - nick wang <[email protected]> + +- bsc#1166200 ,fix crm-fence-peer regex issue with pacemaker 2. +- Add patch crm-fence-peer-pacemaker2.patch + +------------------------------------------------------------------- +Tue Feb 25 06:18:56 UTC 2020 - nick wang <[email protected]> + +- Update to 9.12.0 + * drbd.ocf: new wrc_timeout param, fail on attach failure, + remove_master_score_if_peer_primary param, + fail_promote_early_if_peer_primary param, improved helper logging + no error if wait-connect fails + * drbdadm,v9: fix dumping meta-disk in corner case + * crm-fence-peer.9.sh: fix Pacemaker 2 compat + * drbdsetup,v9: fixes for various json output corner cases + * drbdsetup,all: prepare for netlink changes (linux v5.2+) + * drbdadm,v9: fix a check for setting up connections multiple times + * init: setup file backed loop devices (mapping from LINSTOR) + * rr-conflict: add retry-connect option (>=drbd 9.0.20) + * drbdmon: 256/16 colors; events2 handler improvements + * drbdsetup,v9: new flag: force-resync (>=drbd 9.0.21) +- Remove netlink-prepare-for-kernel-v5.2.patch + Remove netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch + Remove cibadmin-return-code-convert.patch in 144c8cc1d + +------------------------------------------------------------------- +Mon Feb 3 12:26:16 UTC 2020 - Dominique Leuenberger <[email protected]> + +- BuildRequire pkgconfig(udev) instead of udev: allow OBS to + shortcut through the -mini flavors. + +------------------------------------------------------------------- +Thu Oct 17 17:49:08 UTC 2019 - Richard Brown <[email protected]> + +- Remove obsolete Groups tag (fate#326485) + +------------------------------------------------------------------- Old: ---- cibadmin-return-code-convert.patch drbd-utils-9.10.0.tar.gz netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch netlink-prepare-for-kernel-v5.2.patch New: ---- crm-fence-peer-pacemaker2.patch drbd-utils-9.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-utils.spec ++++++ --- /var/tmp/diff_new_pack.psv2k6/_old 2020-03-13 11:01:41.012618990 +0100 +++ /var/tmp/diff_new_pack.psv2k6/_new 2020-03-13 11:01:41.012618990 +0100 @@ -1,7 +1,7 @@ # # spec file for package drbd-utils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,12 +22,11 @@ %bcond_without prebuiltman Name: drbd-utils -Version: 9.10.0 +Version: 9.12.0 Release: 0 Summary: Distributed Replicated Block Device License: GPL-2.0-or-later -Group: Productivity/Clustering/HA -Url: http://www.drbd.org/ +URL: http://www.drbd.org/ Source: http://www.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -37,10 +36,7 @@ # 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 -# Bach port patch for kernel v5.2 -Patch6: netlink-prepare-for-kernel-v5.2.patch -Patch7: netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch -Patch8: cibadmin-return-code-convert.patch +Patch6: crm-fence-peer-pacemaker2.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -67,8 +63,8 @@ BuildRequires: libxslt BuildRequires: make BuildRequires: pkgconfig -BuildRequires: udev BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udev) %if %{with drbdmon} BuildRequires: gcc-c++ %endif @@ -92,8 +88,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build export WANT_DRBD_REPRODUCIBLE_BUILD=1 @@ -176,6 +170,7 @@ %{_tmpfilesdir}/drbd.conf %doc %{_mandir}/man5/drbd.* %doc %{_mandir}/man8/drbd* +%doc %{_mandir}/man7/ocf_linbit_drbd.* %doc %{_mandir}/ja/man5/drbd.* %doc %{_mandir}/ja/man8/drbd* %doc COPYING ++++++ _service ++++++ --- /var/tmp/diff_new_pack.psv2k6/_old 2020-03-13 11:01:41.044619013 +0100 +++ /var/tmp/diff_new_pack.psv2k6/_new 2020-03-13 11:01:41.044619013 +0100 @@ -5,10 +5,10 @@ <param name="filename">drbd-utils</param> <!-- build service using release drbd-utils atm. - <param name="version">9.9.0</param> + <param name="version">9.12.0</param> Using release tarball instead of git since need buildtag.c/h --> - <param name="versionformat">9.9.0+git.%h</param> + <param name="versionformat">9.12.0+git.%h</param> <param name="revision">master</param> </service> ++++++ crm-fence-peer-pacemaker2.patch ++++++ commit fd2eec6eca91e3d4d24852b5bac4dd61f9854e67 Author: Lars Ellenberg <[email protected]> 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"/ { ++++++ drbd-utils-9.10.0.tar.gz -> drbd-utils-9.12.0.tar.gz ++++++ ++++ 6081 lines of diff (skipped)
