Browse Source

Do not skip backup if LA is above threshold

dpeca 7 years ago
parent
commit
3d0e6dd26b
1 changed files with 9 additions and 8 deletions
  1. 9 8
      bin/v-backup-user

+ 9 - 8
bin/v-backup-user

@@ -56,18 +56,19 @@ email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \')
 
 
 # Checking load average
 # Checking load average
 la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
 la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
-i=0
+# i=0
 while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
 while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
     echo -e "$(date "+%F %T") Load Average $la"
     echo -e "$(date "+%F %T") Load Average $la"
     sleep 60
     sleep 60
-    if [ "$i" -ge "15" ]; then
-        la_error="LoadAverage $la is above threshold"
-        echo "$la_error" |$SENDMAIL -s "$subj" $email $notify
-        sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
-        check_result $E_LA "$la_error"
-    fi
+    wait_for_backup_if_it_is_not_time_for_backup
+    # if [ "$i" -ge "15" ]; then
+        # la_error="LoadAverage $la is above threshold"
+        # echo "$la_error" |$SENDMAIL -s "$subj" $email $notify
+        # sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
+        # check_result $E_LA "$la_error"
+    # fi
     la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
     la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
-    (( ++i))
+    # (( ++i))
 done
 done
 
 
 if [ -z "$BACKUP_TEMP" ]; then
 if [ -z "$BACKUP_TEMP" ]; then