summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorMeghana Madhusudhan <mmadhusu@redhat.com>2014-10-21 19:50:29 +0530
committerVijay Bellur <vbellur@redhat.com>2014-10-28 03:21:28 -0700
commitbf6196b876e487c8a37e148b92721f0d85bcfd43 (patch)
tree68f0c179988f144d700066278fca174493f0554c /extras
parent5e9e6c1cc6933c886c8f8334ccee0cc76eb2fcb5 (diff)
Hooks : Infinite while loop introduced by another change.
A change made to all the hook scripts introduced an infinite while loop in the script S31ganesha-reset.sh. It resulted in 100% CPU usage by this script. Change-Id: I8133c92d46616b6534fc88158d6dbfca49875f4a BUG: 1157374 Reviewed-on: http://review.gluster.org/8974 Reviewed-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-by: soumya k <skoduri@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/hook-scripts/reset/post/S31ganesha-reset.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/extras/hook-scripts/reset/post/S31ganesha-reset.sh b/extras/hook-scripts/reset/post/S31ganesha-reset.sh
index c0be3f3841d..8191d960592 100755
--- a/extras/hook-scripts/reset/post/S31ganesha-reset.sh
+++ b/extras/hook-scripts/reset/post/S31ganesha-reset.sh
@@ -17,6 +17,10 @@ function parse_args () {
shift
GLUSTERD_WORKDIR=$1
;;
+ *)
+ shift
+ break
+ ;;
esac
shift
done
@@ -29,7 +33,7 @@ function is_volume_started () {
}
parse_args $@
-if ps auxwww | grep -q "[g]anesha.nfsd"
+if ps aux | grep -q "[g]anesha.nfsd"
then
kill -s TERM `cat /var/run/ganesha.pid`
sleep 10