From f05607fe05f7189dc65a6f328f83db0cbb946426 Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Mon, 23 Dec 2013 14:54:05 +0530 Subject: mgmt/glusterd: make sure quota enforcer has established connection with quotad before marking quota as enabled. without this patch there is a window of time when quota is marked as enabled in quota-enforcer, but connection to quotad wouldn't have been established. Any checklimit done during this period can result in a failed fop because of unavailability of quotad. Change-Id: I0d509fabc434dd55ce9ec59157123524197fcc80 Signed-off-by: Raghavendra G BUG: 969461 Signed-off-by: Raghavendra G Reviewed-on: http://review.gluster.org/6572 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- tests/bugs/bug-1035576.t | 2 +- tests/bugs/bug-848251.t | 1 - tests/bugs/bug-990028.t | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/bugs') diff --git a/tests/bugs/bug-1035576.t b/tests/bugs/bug-1035576.t index 08c8a5ea249..52d93dd87df 100644 --- a/tests/bugs/bug-1035576.t +++ b/tests/bugs/bug-1035576.t @@ -21,7 +21,7 @@ TEST $CLI volume set $V0 performance.read-ahead off TEST $CLI volume set $V0 background-self-heal-count 0 TEST $CLI volume set $V0 self-heal-daemon off TEST $CLI volume quota $V0 enable -sleep 5 # wait for brick to connect to quotad + TEST kill_brick $V0 $H0 $B0/${V0}0 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 cd $M0 diff --git a/tests/bugs/bug-848251.t b/tests/bugs/bug-848251.t index 844162283d8..a5c80b1b473 100644 --- a/tests/bugs/bug-848251.t +++ b/tests/bugs/bug-848251.t @@ -19,7 +19,6 @@ TEST $CLI volume quota $V0 enable; TEST MOUNTDIR="/tmp/$RANDOM" TEST mkdir $MOUNTDIR TEST glusterfs -s $H0 --volfile-id=$V0 $MOUNTDIR -sleep 10 function set_quota(){ mkdir "$MOUNTDIR/$name" diff --git a/tests/bugs/bug-990028.t b/tests/bugs/bug-990028.t index ece7235cd96..fbf4175bea7 100755 --- a/tests/bugs/bug-990028.t +++ b/tests/bugs/bug-990028.t @@ -22,7 +22,6 @@ function __init() TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 TEST $CLI volume quota $V0 enable - sleep 15 } #CASE-1 -- cgit