From d13b91a82eca491604043114e5f6599e1080befa Mon Sep 17 00:00:00 2001 From: Gluster Jenkins Date: Tue, 10 Nov 2020 14:33:48 +0000 Subject: [PATCH] autobuild v6.0-48 Resolves: bz#1895301 Signed-off-by: Gluster Jenkins --- ...ha-ha-revised-regex-exprs-for-status.patch | 53 +++++++++++++++++++ glusterfs.spec | 6 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0479-ganesha-ha-revised-regex-exprs-for-status.patch diff --git a/0479-ganesha-ha-revised-regex-exprs-for-status.patch b/0479-ganesha-ha-revised-regex-exprs-for-status.patch new file mode 100644 index 0000000..8bbdf9d --- /dev/null +++ b/0479-ganesha-ha-revised-regex-exprs-for-status.patch @@ -0,0 +1,53 @@ +From 9036c9f0fd081c83c5c4fcd1ecba858421442777 Mon Sep 17 00:00:00 2001 +From: "Kaleb S. KEITHLEY" +Date: Tue, 10 Nov 2020 07:39:14 -0500 +Subject: [PATCH 479/479] ganesha-ha: revised regex exprs for --status + +better whitespace in regex + +This has worked for years, but somehow no longer works on rhel8 + +> Updates: #1000 +> Change-Id: I2c1a3537573d125608334772ba1a263c55407dd4 +> Signed-off-by: Kaleb S. KEITHLEY +> https://github.com/gluster/glusterfs/commit/4026fe9a956238d8e4785cf39c3b7290eae90f03 + +BUG: 1895301 +Change-Id: I2c1a3537573d125608334772ba1a263c55407dd4 +Signed-off-by: Kaleb S. KEITHLEY +Reviewed-on: https://code.engineering.redhat.com/gerrit/217480 +Tested-by: RHGS Build Bot +--- + extras/ganesha/scripts/ganesha-ha.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh +index 9790a71..491c61d 100644 +--- a/extras/ganesha/scripts/ganesha-ha.sh ++++ b/extras/ganesha/scripts/ganesha-ha.sh +@@ -948,18 +948,18 @@ status() + # check if the VIP and port block/unblock RAs are on the expected nodes + for n in ${nodes[*]}; do + +- grep -E -x "${n}-nfs_block \(ocf::heartbeat:portblock\): Started ${n}" > /dev/null 2>&1 ${scratch} ++ grep -E -x "${n}-nfs_block +\(ocf::heartbeat:portblock\): +Started ${n}" > /dev/null 2>&1 ${scratch} + result=$? + ((healthy+=${result})) +- grep -E -x "${n}-cluster_ip-1 \(ocf::heartbeat:IPaddr\): Started ${n}" > /dev/null 2>&1 ${scratch} ++ grep -E -x "${n}-cluster_ip-1 +\(ocf::heartbeat:IPaddr\): +Started ${n}" > /dev/null 2>&1 ${scratch} + result=$? + ((healthy+=${result})) +- grep -E -x "${n}-nfs_unblock \(ocf::heartbeat:portblock\): Started ${n}" > /dev/null 2>&1 ${scratch} ++ grep -E -x "${n}-nfs_unblock +\(ocf::heartbeat:portblock\): +Started ${n}" > /dev/null 2>&1 ${scratch} + result=$? + ((healthy+=${result})) + done + +- grep -E "\):\ Stopped|FAILED" > /dev/null 2>&1 ${scratch} ++ grep -E "\): +Stopped|FAILED" > /dev/null 2>&1 ${scratch} + result=$? + + if [ ${result} -eq 0 ]; then +-- +1.8.3.1 + diff --git a/glusterfs.spec b/glusterfs.spec index 3f56be8..403fa85 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -237,7 +237,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} %else Name: glusterfs Version: 6.0 -Release: 47%{?dist} +Release: 48%{?dist} ExcludeArch: i686 %endif License: GPLv2 or LGPLv3+ @@ -793,6 +793,7 @@ Patch0475: 0475-fuse-lock-interrupt-fix-flock_interrupt.t.patch Patch0476: 0476-mount-fuse-use-cookies-to-get-fuse-interrupt-record-.patch Patch0477: 0477-glusterd-snapshot-Snapshot-prevalidation-failure-not.patch Patch0478: 0478-DHT-Fixing-rebalance-failure-on-issuing-stop-command.patch +Patch0479: 0479-ganesha-ha-revised-regex-exprs-for-status.patch %description GlusterFS is a distributed file-system capable of scaling to several @@ -2536,6 +2537,9 @@ fi %endif %changelog +* Tue Nov 10 2020 Gluster Jenkins - 6.0-48 +- fixes bugs bz#1895301 + * Thu Nov 05 2020 Gluster Jenkins - 6.0-47 - fixes bugs bz#1286171 bz#1821743 bz#1837926