Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2019-04-04 14:11:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Thu Apr 4 14:11:41 2019 rev:92 rq:690568 version:4.2.0+git63.0f7987fb
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2019-02-24 18:02:46.399787411 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.3908/resource-agents.changes
2019-04-04 14:11:42.841277990 +0200
@@ -1,0 +2,6 @@
+Tue Apr 02 10:50:22 UTC 2019 - [email protected]
+
+- LVM-activate returns the correct value on initial probe (bsc#1114855)
+ * 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch
+
+-------------------------------------------------------------------
New:
----
0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.UKRdT3/_old 2019-04-04 14:11:44.561278894 +0200
+++ /var/tmp/diff_new_pack.UKRdT3/_new 2019-04-04 14:11:44.589278909 +0200
@@ -37,6 +37,8 @@
Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
# PATCH-FIX-OPENSUSE: Revert ocf_log: use same log format at pacemaker
Patch6: 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch
+# bsc#1114855
+Patch7: 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -110,6 +112,7 @@
%patch3 -p1
%patch4 -p1
%patch6 -p1
+%patch7 -p1
%build
autoreconf -fvi
++++++ 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch ++++++
>From 6934468b115902ea2662edb3a3e8fc1d877ffa79 Mon Sep 17 00:00:00 2001
From: Roger Zhou <[email protected]>
Date: Mon, 1 Apr 2019 22:57:26 +0800
Subject: [PATCH] LVM-activate: return OCF_NOT_RUNNING on initial probe
In the use case of lvm on top of cluster md/raid. When the fenced node
rejoins to the cluster, Pacemaker will run the monitor action for the
probe operation. At that time, LVM PV and VG won't exist before cluster
md/raid get assembled, and the probe should return $OCF_NOT_RUNNING
instead of $OCF_ERR_CONFIGURED.
Signed-off-by: Roger Zhou <[email protected]>
---
heartbeat/LVM-activate | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/heartbeat/LVM-activate b/heartbeat/LVM-activate
index 3c462c75..854ae3fa 100755
--- a/heartbeat/LVM-activate
+++ b/heartbeat/LVM-activate
@@ -329,6 +329,7 @@ lvmlockd_check()
# Good: lvmlockd is running, and clvmd is not running
if ! pgrep lvmlockd >/dev/null 2>&1 ; then
if ocf_is_probe; then
+ ocf_log info "initial probe: lvmlockd is not running
yet."
exit $OCF_NOT_RUNNING
fi
@@ -481,6 +482,11 @@ lvm_validate() {
exit $OCF_SUCCESS
fi
+ if ocf_is_probe; then
+ ocf_log info "initial probe: VG [${VG}] doesn't exist
on any block device yet."
+ exit $OCF_NOT_RUNNING
+ fi
+
ocf_exit_reason "Volume group[${VG}] doesn't exist, or not
visible on this node!"
exit $OCF_ERR_CONFIGURED
fi
--
2.12.3
