WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ps -a instead of ps -A, % diskspace

This commit is contained in:
Enrico Da Ros 2020-11-04 15:44:54 +01:00
parent 81437b5824
commit cc21cc6acc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/n_osync.sh
View File

@ -287,6 +287,9 @@ function _CheckReplicasLocal {
if [ $MINIMUM_SPACE -ne 0 ]; then if [ $MINIMUM_SPACE -ne 0 ]; then
Logger "Checking minimum disk space in local replica [$replicaPath]." "NOTICE" Logger "Checking minimum disk space in local replica [$replicaPath]." "NOTICE"
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}') diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}')
if [[ $diskSpace == *"%"* ]]; then
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $3}')
fi
retval=$? retval=$?
if [ $retval -ne 0 ]; then if [ $retval -ne 0 ]; then
Logger "Cannot get free space." "ERROR" $retval Logger "Cannot get free space." "ERROR" $retval
@ -355,6 +358,9 @@ function _CheckReplicasRemoteSub {
if [ $MINIMUM_SPACE -ne 0 ]; then if [ $MINIMUM_SPACE -ne 0 ]; then
RemoteLogger "Checking minimum disk space in remote replica [$replicaPath]." "NOTICE" RemoteLogger "Checking minimum disk space in remote replica [$replicaPath]." "NOTICE"
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}') diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}')
if [[ $diskSpace == *"%"* ]]; then
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $3}')
fi
retval=$? retval=$?
if [ $retval -ne 0 ]; then if [ $retval -ne 0 ]; then
RemoteLogger "Cannot get free space." "ERROR" $retval RemoteLogger "Cannot get free space." "ERROR" $retval
@ -508,7 +514,7 @@ function _HandleLocksRemote {
CheckConnectivityRemoteHost CheckConnectivityRemoteHost
# Create an array of all currently running pids # Create an array of all currently running pids
read -a initiatorRunningPids <<< $(ps -A | tail -n +2 | awk '{print $1}') read -a initiatorRunningPids <<< $(ps -a | tail -n +2 | awk '{print $1}')
# passing initiatorRunningPids as litteral string (has to be run through eval to be an array again) # passing initiatorRunningPids as litteral string (has to be run through eval to be an array again)
$SSH_CMD env _REMOTE_TOKEN="$_REMOTE_TOKEN" \ $SSH_CMD env _REMOTE_TOKEN="$_REMOTE_TOKEN" \