You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
2.1 KiB
49 lines
2.1 KiB
From 4e8c08a6d966f4e3deca03f4f1c4b5904939e640 Mon Sep 17 00:00:00 2001 |
|
From: David Vossel <dvossel@redhat.com> |
|
Date: Thu, 25 Jun 2015 16:27:47 -0500 |
|
Subject: [PATCH 2/3] bz1214781-lvm-partial-activation-fix.patch |
|
|
|
--- |
|
heartbeat/LVM | 26 ++++++++++++++++++++++++-- |
|
1 file changed, 24 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/heartbeat/LVM b/heartbeat/LVM |
|
index 58cbe83..4b9c167 100755 |
|
--- a/heartbeat/LVM |
|
+++ b/heartbeat/LVM |
|
@@ -568,8 +568,30 @@ LVM_validate_all() { |
|
## |
|
VGOUT=`vgck ${VOLUME} 2>&1` |
|
if [ $? -ne 0 ]; then |
|
- ocf_exit_reason "Volume group [$VOLUME] does not exist or contains error! ${VGOUT}" |
|
- exit $OCF_ERR_GENERIC |
|
+ # Inconsistency might be due to missing physical volumes, which doesn't |
|
+ # automatically mean we should fail. If partial_activation=true then |
|
+ # we should let start try to handle it, or if no PVs are listed as |
|
+ # "unknown device" then another node may have marked a device missing |
|
+ # where we have access to all of them and can start without issue. |
|
+ if vgs -o pv_attr --noheadings $OCF_RESKEY_volgrpname 2>/dev/null | grep 'm' > /dev/null 2>&1; then |
|
+ if vgs -o pv_name --noheadings $OCF_RESKEY_volgrpname 2>/dev/null | grep 'unknown device' > /dev/null 2>&1; then |
|
+ if ! ocf_is_true "$OCF_RESKEY_partial_activation" ; then |
|
+ # We are missing devices and cannot activate partially |
|
+ ocf_exit_reason "Volume group [$VOLUME] has devices missing. Consider partial_activation=true to attempt to activate partially" |
|
+ exit $OCF_ERR_GENERIC |
|
+ else |
|
+ # We are missing devices but are allowed to activate partially. |
|
+ # Assume that caused the vgck failure and carry on |
|
+ ocf_log warn "Volume group inconsistency detected with missing device(s) and partial_activation enabled. Proceeding with requested action." |
|
+ fi |
|
+ fi |
|
+ # else the vg is partial but all devices are accounted for, so another |
|
+ # node must have marked the device missing. Proceed. |
|
+ else |
|
+ # vgck failure was for something other than missing devices |
|
+ ocf_exit_reason "Volume group [$VOLUME] does not exist or contains error! ${VGOUT}" |
|
+ exit $OCF_ERR_GENERIC |
|
+ fi |
|
fi |
|
|
|
## |
|
-- |
|
1.8.4.2 |
|
|
|
|