|
 |
d84cf8 |
From 9036c9f0fd081c83c5c4fcd1ecba858421442777 Mon Sep 17 00:00:00 2001
|
|
|
d84cf8 |
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
|
|
|
d84cf8 |
Date: Tue, 10 Nov 2020 07:39:14 -0500
|
|
|
d84cf8 |
Subject: [PATCH 479/479] ganesha-ha: revised regex exprs for --status
|
|
|
d84cf8 |
|
|
|
d84cf8 |
better whitespace in regex
|
|
|
d84cf8 |
|
|
|
d84cf8 |
This has worked for years, but somehow no longer works on rhel8
|
|
|
d84cf8 |
|
|
|
d84cf8 |
> Updates: #1000
|
|
|
d84cf8 |
> Change-Id: I2c1a3537573d125608334772ba1a263c55407dd4
|
|
|
d84cf8 |
> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
d84cf8 |
> https://github.com/gluster/glusterfs/commit/4026fe9a956238d8e4785cf39c3b7290eae90f03
|
|
|
d84cf8 |
|
|
|
d84cf8 |
BUG: 1895301
|
|
|
d84cf8 |
Change-Id: I2c1a3537573d125608334772ba1a263c55407dd4
|
|
|
d84cf8 |
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
d84cf8 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/217480
|
|
|
d84cf8 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d84cf8 |
---
|
|
|
d84cf8 |
extras/ganesha/scripts/ganesha-ha.sh | 8 ++++----
|
|
|
d84cf8 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
d84cf8 |
|
|
|
d84cf8 |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
d84cf8 |
index 9790a71..491c61d 100644
|
|
|
d84cf8 |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
d84cf8 |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
d84cf8 |
@@ -948,18 +948,18 @@ status()
|
|
|
d84cf8 |
# check if the VIP and port block/unblock RAs are on the expected nodes
|
|
|
d84cf8 |
for n in ${nodes[*]}; do
|
|
|
d84cf8 |
|
|
|
d84cf8 |
- grep -E -x "${n}-nfs_block \(ocf::heartbeat:portblock\): Started ${n}" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
+ grep -E -x "${n}-nfs_block +\(ocf::heartbeat:portblock\): +Started ${n}" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
result=$?
|
|
|
d84cf8 |
((healthy+=${result}))
|
|
|
d84cf8 |
- grep -E -x "${n}-cluster_ip-1 \(ocf::heartbeat:IPaddr\): Started ${n}" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
+ grep -E -x "${n}-cluster_ip-1 +\(ocf::heartbeat:IPaddr\): +Started ${n}" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
result=$?
|
|
|
d84cf8 |
((healthy+=${result}))
|
|
|
d84cf8 |
- grep -E -x "${n}-nfs_unblock \(ocf::heartbeat:portblock\): Started ${n}" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
+ grep -E -x "${n}-nfs_unblock +\(ocf::heartbeat:portblock\): +Started ${n}" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
result=$?
|
|
|
d84cf8 |
((healthy+=${result}))
|
|
|
d84cf8 |
done
|
|
|
d84cf8 |
|
|
|
d84cf8 |
- grep -E "\):\ Stopped|FAILED" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
+ grep -E "\): +Stopped|FAILED" > /dev/null 2>&1 ${scratch}
|
|
|
d84cf8 |
result=$?
|
|
|
d84cf8 |
|
|
|
d84cf8 |
if [ ${result} -eq 0 ]; then
|
|
|
d84cf8 |
--
|
|
|
d84cf8 |
1.8.3.1
|
|
|
d84cf8 |
|