From 63a0e675ad10eb704ab36b4fcbc3ddf9a2326b1f Mon Sep 17 00:00:00 2001 From: Saravanakumar Arumugam Date: Wed, 29 Aug 2018 16:32:29 +0530 Subject: [PATCH 1/3] variable for sleep seconds using sytemd environment. Signed-off-by: Saravanakumar Arumugam --- CentOS/check_diskspace.sh | 2 +- CentOS/gluster-check-diskspace.service | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CentOS/check_diskspace.sh b/CentOS/check_diskspace.sh index 36aae78..43346b9 100644 --- a/CentOS/check_diskspace.sh +++ b/CentOS/check_diskspace.sh @@ -4,7 +4,7 @@ while true do # sleep early to get glusterd settled - sleep 120 + sleep $1 current_usage=$( df --output=pcent '/var/lib/glusterd' | tail -n1 | awk {'print $1'} ) max_usage=99% if [ "${current_usage%?}" -ge "${max_usage%?}" ]; then diff --git a/CentOS/gluster-check-diskspace.service b/CentOS/gluster-check-diskspace.service index 146c376..177e0ff 100644 --- a/CentOS/gluster-check-diskspace.service +++ b/CentOS/gluster-check-diskspace.service @@ -4,7 +4,8 @@ After=glusterd.service [Service] Type=simple -ExecStart=/usr/local/bin/check_diskspace.sh +Environment="POLL_INTERVAL=120" +ExecStart=/usr/local/bin/check_diskspace.sh $POLL_INTERVAL [Install] WantedBy=multi-user.target From ceb4508e74a6cac01c1a423d200865cf840ac803 Mon Sep 17 00:00:00 2001 From: Saravanakumar Arumugam Date: Thu, 30 Aug 2018 17:26:04 +0530 Subject: [PATCH 2/3] POLL_INTERVAL => DISK_CHK_POLL_INTERVAL Signed-off-by: Saravanakumar Arumugam --- CentOS/gluster-check-diskspace.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CentOS/gluster-check-diskspace.service b/CentOS/gluster-check-diskspace.service index 177e0ff..b2c5134 100644 --- a/CentOS/gluster-check-diskspace.service +++ b/CentOS/gluster-check-diskspace.service @@ -4,8 +4,8 @@ After=glusterd.service [Service] Type=simple -Environment="POLL_INTERVAL=120" -ExecStart=/usr/local/bin/check_diskspace.sh $POLL_INTERVAL +Environment="DISK_CHK_POLL_INTERVAL=120" +ExecStart=/usr/local/bin/check_diskspace.sh $DISK_CHK_POLL_INTERVAL [Install] WantedBy=multi-user.target From 0c2808832c99b3b66eb750d4e960018457ecf41b Mon Sep 17 00:00:00 2001 From: Saravanakumar Arumugam Date: Mon, 5 Nov 2018 20:11:56 +0530 Subject: [PATCH 3/3] Use PassEnvironment for passing sleep time argument. Signed-off-by: Saravanakumar Arumugam --- CentOS/check_diskspace.sh | 3 ++- CentOS/gluster-check-diskspace.service | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CentOS/check_diskspace.sh b/CentOS/check_diskspace.sh index 43346b9..11c1a4e 100644 --- a/CentOS/check_diskspace.sh +++ b/CentOS/check_diskspace.sh @@ -1,10 +1,11 @@ #!/bin/bash +DISK_CHK_POLL_INTERVAL=${DISK_CHK_POLL_INTERVAL:-120} # Disk full while true do # sleep early to get glusterd settled - sleep $1 + sleep $DISK_CHK_POLL_INTERVAL current_usage=$( df --output=pcent '/var/lib/glusterd' | tail -n1 | awk {'print $1'} ) max_usage=99% if [ "${current_usage%?}" -ge "${max_usage%?}" ]; then diff --git a/CentOS/gluster-check-diskspace.service b/CentOS/gluster-check-diskspace.service index b2c5134..1eef8fa 100644 --- a/CentOS/gluster-check-diskspace.service +++ b/CentOS/gluster-check-diskspace.service @@ -4,7 +4,7 @@ After=glusterd.service [Service] Type=simple -Environment="DISK_CHK_POLL_INTERVAL=120" +PassEnvironment=DISK_CHK_POLL_INTERVAL ExecStart=/usr/local/bin/check_diskspace.sh $DISK_CHK_POLL_INTERVAL [Install]