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