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