cluster/ec: Make background healing optional behavior

Provide options to control number of active background heal count and qlen.

Change-Id: Idc2419219d881f47e7d2e9bbc1dcdd999b372033
BUG: 1237381
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/11473
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Tested-by: Gluster Build System <jenkins@build.gluster.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/tests/basic/afr/self-heald.t b/tests/basic/afr/self-heald.t
index ee0afaf9d4e..b8bee5cf0a1 100644
--- a/tests/basic/afr/self-heald.t
+++ b/tests/basic/afr/self-heald.t
@@ -68,7 +68,7 @@ done
 HEAL_FILES=$(($HEAL_FILES + 3))
 
 cd ~
-EXPECT "$HEAL_FILES" afr_get_pending_heal_count $V0
+EXPECT "$HEAL_FILES" get_pending_heal_count $V0
 
 #When bricks are down, it says Transport End point Not connected for them
 EXPECT "3" disconnected_brick_count $V0
@@ -78,12 +78,12 @@ EXPECT "3" disconnected_brick_count $V0
 #replica pair.
 for i in {11..20}; do echo abc > $M0/$i; done
 HEAL_FILES=$(($HEAL_FILES + 10)) #count extra 10 files
-EXPECT "$HEAL_FILES" afr_get_pending_heal_count $V0
+EXPECT "$HEAL_FILES" get_pending_heal_count $V0
 #delete the files now, so that stale indices will remain.
 for i in {11..20}; do rm -f $M0/$i; done
 #After deleting files they should not appear in heal info
 HEAL_FILES=$(($HEAL_FILES - 10))
-EXPECT "$HEAL_FILES" afr_get_pending_heal_count $V0
+EXPECT "$HEAL_FILES" get_pending_heal_count $V0
 
 
 TEST ! $CLI volume heal $V0
@@ -99,10 +99,10 @@ check_bricks_up $V0
 TEST $CLI volume heal $V0
 sleep 5 #Until the heal-statistics command implementation
 #check that this heals the contents partially
-TEST [ $HEAL_FILES -gt $(afr_get_pending_heal_count $V0) ]
+TEST [ $HEAL_FILES -gt $(get_pending_heal_count $V0) ]
 
 TEST $CLI volume heal $V0 full
-EXPECT_WITHIN 30 "0" afr_get_pending_heal_count $V0
+EXPECT_WITHIN 30 "0" get_pending_heal_count $V0
 
 #Test that ongoing IO is not considered as Pending heal
 (dd if=/dev/zero of=$M0/file1 bs=1k 2>/dev/null 1>/dev/null)&
@@ -115,7 +115,7 @@ back_pid3=$!;
 back_pid4=$!;
 (dd if=/dev/zero of=$M0/file5 bs=1k 2>/dev/null 1>/dev/null)&
 back_pid5=$!;
-EXPECT 0 afr_get_pending_heal_count $V0
+EXPECT 0 get_pending_heal_count $V0
 kill -SIGTERM $back_pid1;
 kill -SIGTERM $back_pid2;
 kill -SIGTERM $back_pid3;
@@ -132,13 +132,13 @@ TEST $CLI volume set $V0 cluster.data-self-heal off
 EXPECT "off" volume_option $V0 cluster.data-self-heal
 kill_multiple_bricks $V0 $H0 $B0
 echo abc > $M0/f
-EXPECT 1 afr_get_pending_heal_count $V0
+EXPECT 1 get_pending_heal_count $V0
 TEST $CLI volume start $V0 force
 EXPECT_WITHIN 20 "Y" glustershd_up_status
 check_bricks_up $V0
 
 TEST $CLI volume heal $V0
-EXPECT_WITHIN 30 "0" afr_get_pending_heal_count $V0
+EXPECT_WITHIN 30 "0" get_pending_heal_count $V0
 TEST $CLI volume set $V0 cluster.data-self-heal on
 
 #METADATA
@@ -147,13 +147,13 @@ EXPECT "off" volume_option $V0 cluster.metadata-self-heal
 kill_multiple_bricks $V0 $H0 $B0
 
 TEST chmod 777 $M0/f
-EXPECT 1 afr_get_pending_heal_count $V0
+EXPECT 1 get_pending_heal_count $V0
 TEST $CLI volume start $V0 force
 EXPECT_WITHIN 20 "Y" glustershd_up_status
 check_bricks_up $V0
 
 TEST $CLI volume heal $V0
-EXPECT_WITHIN 30 "0" afr_get_pending_heal_count $V0
+EXPECT_WITHIN 30 "0" get_pending_heal_count $V0
 TEST $CLI volume set $V0 cluster.metadata-self-heal on
 
 #ENTRY
@@ -163,13 +163,13 @@ kill_multiple_bricks $V0 $H0 $B0
 TEST touch $M0/d/a
 # 4 if mtime/ctime is modified for d in bricks without a
 # 2 otherwise
-PENDING=$( afr_get_pending_heal_count $V0 )
+PENDING=$( get_pending_heal_count $V0 )
 TEST test $PENDING -eq 2 -o $PENDING -eq 4
 TEST $CLI volume start $V0 force
 EXPECT_WITHIN 20 "Y" glustershd_up_status
 check_bricks_up $V0
 TEST $CLI volume heal $V0
-EXPECT_WITHIN 30 "0" afr_get_pending_heal_count $V0
+EXPECT_WITHIN 30 "0" get_pending_heal_count $V0
 TEST $CLI volume set $V0 cluster.entry-self-heal on
 
 #Negative test cases