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

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

Browse Source 
bsc#1048671, Fix handler called from kernel always invalid for stack mode.

OBS-URL: https://build.opensuse.org/request/show/512447
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=42
This commit is contained in:
nick wang 2017-07-25 09:20:15 +00:00 committed by Git OBS Bridge
parent 5896bfb840
commit 54eb99ddb4
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drbd-utils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 25 08:35:18 UTC 2017 - nwang@suse.com
- bsc#1048671, Fix handler called from kernel always invalid
for stacking resource
- Add fix_call_khelper_with_stack.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 7 08:13:07 UTC 2017 - nwang@suse.com Wed Jun 7 08:13:07 UTC 2017 - nwang@suse.com

4
drbd-utils.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package drbd-utils # spec file for package drbd-utils
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,7 @@ Patch3: fence-after-pacemaker-down.patch
Patch4: fix-segfault-up-stacked-resource.patch Patch4: fix-segfault-up-stacked-resource.patch
# PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142) # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
Patch6: fix_call_khelper_with_stack.patch
Provides: drbd-bash-completion = %{version} Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version} Provides: drbd-pacemaker = %{version}
@ -76,6 +77,7 @@ raid 1. It is a building block for setting up clusters.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%build %build
./autogen.sh ./autogen.sh

33
fix_call_khelper_with_stack.patch Normal file
View File

@ -0,0 +1,33 @@
From 7ba13eefd22b1ab3c84bd115dded3e4dbbf5b5c8 Mon Sep 17 00:00:00 2001
From: Nick Wang <nwang@suse.com>
Date: Mon, 17 Jul 2017 16:41:08 +0800
Subject: [PATCH] drbdadm: Fix handler called from kernel invalid return for
stacking resource
Handler like "before-resync-target" called from kernel
space does not have "-S" option for stacking resource, it
always return as invalid usage for stacking resource in
normal mode, then the connection will be dropped. Add "-S"
option for stacking resource automatically if the handler
is called from kernel.
---
user/v9/drbdadm_main.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/user/v9/drbdadm_main.c b/user/v9/drbdadm_main.c
index 3c6e2263..f6cd8b74 100644
--- a/user/v9/drbdadm_main.c
+++ b/user/v9/drbdadm_main.c
@@ -3472,6 +3472,9 @@ int main(int argc, char **argv)
rv = E_USAGE;
continue;
}
+ if (3 == cmd->show_in_usage && ctx.res->stacked) {
+ is_drbd_top = 1;
+ }
if (is_drbd_top != ctx.res->stacked && !is_dump) {
err("'%s' is a %s resource, and not available in %s mode.\n",
ctx.res->name,
--
2.12.0