pool/drbd-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 832640 from network:ha-clustering:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/832640
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=39
This commit is contained in:
Dominique Leuenberger 2020-09-07 19:35:21 +00:00 committed by Git OBS Bridge
commit f36afc6e9f
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crm-fence-peer-pacemaker2-issue2.patch Normal file
View File

@ -0,0 +1,30 @@
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/ {

6
drbd-utils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 4 02:29:56 UTC 2020 - nick wang <nwang@suse.com>
- bsc#1176065, fail to get master id from cib xml in fence handler
Add patch crm-fence-peer-pacemaker2-issue2.patch
-------------------------------------------------------------------
Mon Jun 8 08:11:04 UTC 2020 - nick wang <nwang@suse.com>

2
drbd-utils.spec
View File

@ -35,6 +35,7 @@ Patch3: fence-after-pacemaker-down.patch
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,6 +86,7 @@ raid 1. It is a building block for setting up clusters.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
export WANT_DRBD_REPRODUCIBLE_BUILD=1