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

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

Browse Source 
bsc#1145296, fix the wrong return code with cib_apply_diff

OBS-URL: https://build.opensuse.org/request/show/732100
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=83
This commit is contained in:
nick wang 2019-09-20 08:12:33 +00:00 committed by Git OBS Bridge
parent 6d0e87a290
commit 557288e59e
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cibadmin-return-code-convert.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur drbd-utils-9.6.0.orig/scripts/crm-fence-peer.9.sh drbd-utils-9.6.0/scripts/crm-fence-peer.9.sh
--- drbd-utils-9.6.0.orig/scripts/crm-fence-peer.9.sh 2019-09-03 14:13:56.861585246 +0800
+++ drbd-utils-9.6.0/scripts/crm-fence-peer.9.sh 2019-09-03 14:17:42.478881632 +0800
@@ -146,7 +146,7 @@
break
;;
- 205) : "205 aka pcmk_err_old_data ==> going to retry in a bit"
+ 103) : "103 CRM_EX_OLD, aka 205 pcmk_err_old_data in cib_apply_diff ==> going to retry in a bit"
(( $SECONDS >= $timeout )) && break
sleep 1
continue

6
drbd-utils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 20 06:18:33 UTC 2019 - nick wang <nwang@suse.com>
- bsc#1145296, fix the wrong return code with cib_apply_diff
Add patch cibadmin-return-code-convert.patch
-------------------------------------------------------------------
Mon Sep 6 08:57:04 UTC 2019 - nwang@suse.com

12
drbd-utils.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package drbd-utils
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -25,7 +25,7 @@ Name: drbd-utils
Version: 9.10.0
Release: 0
Summary: Distributed Replicated Block Device
License: GPL-2.0+
License: GPL-2.0-or-later
Group: Productivity/Clustering/HA
Url: http://www.drbd.org/
Source: http://www.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz
@ -40,6 +40,7 @@ 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
Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version}
@ -66,13 +67,13 @@ BuildRequires: glibc-devel
BuildRequires: libxslt
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: pkgconfig(systemd)
BuildRequires: udev
BuildRequires: pkgconfig(systemd)
%if %{with drbdmon}
BuildRequires: gcc-c++
%endif
%if %{without prebuiltman}
BuildRequires: po4a
BuildRequires: po4a
%endif
Provides: drbd-control
Provides: drbdsetup
@ -92,6 +93,7 @@ raid 1. It is a building block for setting up clusters.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
export WANT_DRBD_REPRODUCIBLE_BUILD=1