a3470f
From d2a15381b5cd414aa1dcf585a495200a29390f7e Mon Sep 17 00:00:00 2001
a3470f
From: karthik-us <ksubrahm@redhat.com>
a3470f
Date: Tue, 22 May 2018 17:11:11 +0530
a3470f
Subject: [PATCH 276/282] tests: check volume status for shd being up
a3470f
a3470f
so that glusterd is also aware that shd is up and running.
a3470f
a3470f
While not reproducible locally, on the jenkins slaves, 'gluster vol heal patchy'
a3470f
fails with "Self-heal daemon is not running. Check self-heal daemon log file.",
a3470f
while infact the afr_child_up_status_in_shd() checks before that passed. In the
a3470f
shd log also, I see the shd being up and connected to at least one brick before
a3470f
the heal is launched.
a3470f
a3470f
Upstream Patch: https://review.gluster.org/#/c/19185/
a3470f
a3470f
> Change-Id: Id3801fa4ab56a70b1f0bd6a7e240f69bea74a5fc
a3470f
> BUG: 1515163
a3470f
> Signed-off-by: Ravishankar N <ravishankar@redhat.com>
a3470f
a3470f
Change-Id: Iec44500dc52b0991cc45befaa4b40351ab1ad870
a3470f
BUG: 1581219
a3470f
Signed-off-by: karthik-us <ksubrahm@redhat.com>
a3470f
Reviewed-on: https://code.engineering.redhat.com/gerrit/139486
a3470f
Reviewed-by: Ravishankar Narayanankutty <ravishankar@redhat.com>
a3470f
Tested-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
a3470f
Tested-by: RHGS Build Bot <nigelb@redhat.com>
a3470f
---
a3470f
 tests/bugs/replicate/bug-1292379.t | 1 +
a3470f
 1 file changed, 1 insertion(+)
a3470f
a3470f
diff --git a/tests/bugs/replicate/bug-1292379.t b/tests/bugs/replicate/bug-1292379.t
a3470f
index f086502..be1bf69 100644
a3470f
--- a/tests/bugs/replicate/bug-1292379.t
a3470f
+++ b/tests/bugs/replicate/bug-1292379.t
a3470f
@@ -39,6 +39,7 @@ TEST $CLI volume start $V0 force
a3470f
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0
a3470f
 TEST fd_write $wfd "pqrs"
a3470f
 TEST $CLI volume set $V0 self-heal-daemon on
a3470f
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status
a3470f
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0
a3470f
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1
a3470f
 
a3470f
-- 
a3470f
1.8.3.1
a3470f