diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2016-02-10 15:28:39 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-02-11 09:05:46 -0800 |
| commit | 320779d53ae013147d5e2556d2946c73e45734ab (patch) | |
| tree | a0c67f672ece7ea4a3e67774260b8b5c699cdebb | |
| parent | 095e2c48271a5248c8711a4e6a34bcb4d44c440e (diff) | |
heal: Remove sleep()
I wrote this program from a sample gfapi program which had sleep.
I am not sure why this sleep was needed. So removing it now.
Changed tests/bugs/replicate/bug-1190069-afr-stale-index-entries.t
to execute count_sh_entries every second, instead of comparing
same value over and over.
Change-Id: I7b89d6cab3e50bb7bf4d40a6064f2d8734155bea
BUG: 1306199
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/13421
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
| -rw-r--r-- | heal/src/glfs-heal.c | 1 | ||||
| -rw-r--r-- | tests/bugs/replicate/bug-1190069-afr-stale-index-entries.t | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c index 0be21bb57a4..c6c1161b05b 100644 --- a/heal/src/glfs-heal.c +++ b/heal/src/glfs-heal.c @@ -937,7 +937,6 @@ main (int argc, char **argv) goto out; } - sleep (2); top_subvol = glfs_active_subvol (fs); if (!top_subvol) { ret = -1; diff --git a/tests/bugs/replicate/bug-1190069-afr-stale-index-entries.t b/tests/bugs/replicate/bug-1190069-afr-stale-index-entries.t index 2da960f6c7c..81655074c9c 100644 --- a/tests/bugs/replicate/bug-1190069-afr-stale-index-entries.t +++ b/tests/bugs/replicate/bug-1190069-afr-stale-index-entries.t @@ -39,8 +39,8 @@ EXPECT_WITHIN $CHILD_UP_TIMEOUT '1' afr_child_up_status_in_shd $V0 0 EXPECT_WITHIN $CHILD_UP_TIMEOUT '1' afr_child_up_status_in_shd $V0 1 TEST $CLI volume heal $V0 -EXPECT_WITHIN $HEAL_TIMEOUT '2' echo $(count_sh_entries $B0/$V0"0") -EXPECT_WITHIN $HEAL_TIMEOUT '2' echo $(count_sh_entries $B0/$V0"1") +EXPECT_WITHIN $HEAL_TIMEOUT '2' count_sh_entries $B0/$V0"0" +EXPECT_WITHIN $HEAL_TIMEOUT '2' count_sh_entries $B0/$V0"1" #Reset xattrs and trigger heal. TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}0/datafile @@ -51,7 +51,7 @@ TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000000000000000000000 $B0/${V0 TEST $CLI volume heal $V0 EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0 -EXPECT_WITHIN $HEAL_TIMEOUT '0' echo $(count_sh_entries $B0/$V0"0") -EXPECT_WITHIN $HEAL_TIMEOUT '0' echo $(count_sh_entries $B0/$V0"1") +EXPECT_WITHIN $HEAL_TIMEOUT '0' count_sh_entries $B0/$V0"0" +EXPECT_WITHIN $HEAL_TIMEOUT '0' count_sh_entries $B0/$V0"1" cleanup |