Accepting request 833605 from home:wanghaisu:branches:network:ha-clustering:Factory

bsc#1176065, fail to get master id from cib xml in fence handler

OBS-URL: https://build.opensuse.org/request/show/833605
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=98

crm-fence-peer-pacemaker2-issue2.patch

@@ -1,30 +0,0 @@
-error msg when using fence-handler:
-sed: -e expression #1, char 28: unknown command: `\'
-WARNING drbd-fencing could not determine the master id of drbd resource xxx
-
-Either replace the '\\' to '\' or change back to the original "xxx"'
-quotation could fix the error.
-diff -Naur drbd-utils-9.13.0.orig/scripts/crm-fence-peer.9.sh drbd-utils-9.13.0/scripts/crm-fence-peer.9.sh
---- drbd-utils-9.13.0.orig/scripts/crm-fence-peer.9.sh	2020-09-04 15:47:07.865987423 +0800
-+++ drbd-utils-9.13.0/scripts/crm-fence-peer.9.sh	2020-09-04 15:47:25.086005572 +0800
-@@ -214,7 +214,7 @@
- 	# 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\|master\) /,/<\\/\(clone\|master\)>/ {
-+		sed -ne '/<\(clone\|master\) /,/<\/\(clone\|master\)>/ {
- 			   /<\(clone\|master\) / h;
- 			     /<primitive/,/<\/primitive/ {
- 			       /<instance_attributes/,/<\/instance_attributes/ {
-diff -Naur drbd-utils-9.13.0.orig/scripts/crm-fence-peer.sh drbd-utils-9.13.0/scripts/crm-fence-peer.sh
---- drbd-utils-9.13.0.orig/scripts/crm-fence-peer.sh	2020-09-04 15:47:07.865987423 +0800
-+++ drbd-utils-9.13.0/scripts/crm-fence-peer.sh	2020-09-04 15:47:37.046018153 +0800
-@@ -87,7 +87,7 @@
- 	# 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\|master\) /,/<\\/\(clone\|master\)>/ {
-+		sed -ne '/<\(clone\|master\) /,/<\/\(clone\|master\)>/ {
- 			   /<\(clone\|master\) / h;
- 			     /<primitive/,/<\/primitive/ {
- 			       /<instance_attributes/,/<\/instance_attributes/ {

drbd-utils-9.13.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a21691374604cbfe0d732c688a72f9e4b46a502400a5a0065a25608233141b1
-size 1209926

drbd-utils-9.14.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01fa37d6dbf4bb9e7007db11ec13d0d376f9701ab3393fe221789d5368b9a078
+size 1224291

drbd-utils.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Sep 11 02:35:49 UTC 2020 - nick wang <nwang@suse.com>
+
+- bsc#1176436, update to 9.14.0
+ * pacemaker: various fixes/improvements for PM >=1.1.15
+   including the 2 series; crm-fence-peer.9.sh
+ * systemd dependency for drbd-proxy
+ * containers: multi-arch support, especially for s390x
+ * multipathd: blacklist drbd
+ * drbdsetup: code refactoring and improvements,
+   as well as tests for events2!
+   add "may_promote", "promotion_score". See man page.
+ * build: compile fixes for gcc-10; CI pipeline
+ * handlers: add "disconnected"
+- Remove patch crm-fence-peer-pacemaker2-issue2.patch (included)
+  Remove patch link-error-setup_option.patch (included)
+
 -------------------------------------------------------------------
 Fri Sep  4 02:29:56 UTC 2020 - nick wang <nwang@suse.com>
 

drbd-utils.spec

@@ -21,7 +21,7 @@
 # Only need po4a to build man from git source code
 %bcond_without prebuiltman
 Name:           drbd-utils
-Version:        9.13.0
+Version:        9.14.0
 Release:        0
 Summary:        Distributed Replicated Block Device
 License:        GPL-2.0-or-later
@@ -34,8 +34,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:         link-error-setup_option.patch
-Patch7:         crm-fence-peer-pacemaker2-issue2.patch
 
 Provides:       drbd-bash-completion = %{version}
 Provides:       drbd-pacemaker = %{version}
@@ -85,8 +83,6 @@ raid 1. It is a building block for setting up clusters.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1
@@ -166,6 +162,7 @@ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
 %config(noreplace) %{_sysconfdir}/drbd.conf
 %config %{_sysconfdir}/bash_completion.d/drbdadm.sh
 %config(noreplace) %{_sysconfdir}/drbd.d/global_common.conf
+%config(noreplace) %{_sysconfdir}/multipath/conf.d/drbd.conf
 %{_tmpfilesdir}/drbd.conf
 %doc %{_mandir}/man5/drbd.*
 %doc %{_mandir}/man8/drbd*
@@ -177,6 +174,8 @@ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
 %doc ChangeLog
 %doc scripts/drbd.conf.example
 %dir %{_sysconfdir}/drbd.d
+%dir %{_sysconfdir}/multipath
+%dir %{_sysconfdir}/multipath/conf.d
 /sbin/drbdadm
 /sbin/drbdsetup
 /sbin/drbdmeta

link-error-setup_option.patch

@@ -1,12 +0,0 @@
-diff -Naur drbd-utils-9.13.0.orig/user/v84/drbdadm.h drbd-utils-9.13.0/user/v84/drbdadm.h
---- drbd-utils-9.13.0.orig/user/v84/drbdadm.h	2020-06-08 16:00:20.166480137 +0800
-+++ drbd-utils-9.13.0/user/v84/drbdadm.h	2020-06-08 16:00:42.930652069 +0800
-@@ -251,7 +251,7 @@
- 	bool explicit;
- 	char *option;
- };
--struct setup_option *setup_options;
-+extern struct setup_option *setup_options;
- 
- extern void add_setup_option(bool explicit, char *option);
-