fix elapsed & last time after multi target handover in restore

Author: generationtech

scripts/bacchus-restore-new-volume.sh

@@ -43,6 +43,7 @@ while true; do
   fi
 
   if [ ! -f "$source" ]; then
+    stop_timestamp=$(date +%s)
     printf "\nArchive volume %s NOT FOUND in %s\n" "$(basename "$source")" "$bcs_source"
     printf "Either place this file in the source directory and press enter\n"
     printf "Or enter a new source path and press enter\n"
@@ -52,6 +53,12 @@ while true; do
       bcs_source="$newpath"
     fi
   else
+    if [ -n "$newpath" ]; then
+      unset newpath
+      resume_timestamp=$(date +%s)
+      start_timestamp_running=$(( start_timestamp_running + (resume_timestamp - stop_timestamp) ))
+      last_timestamp_running=$(( last_timestamp_running + (resume_timestamp - stop_timestamp) ))
+    fi
     break
   fi
 done
@@ -68,7 +75,7 @@ else
   printf '%s\n' "$filename"
 fi
 
-last_timestamp="$(date +%s)"
+last_timestamp=$(date +%s)
 source="$bcs_source"/"$filename"
 Process_Volume "$filename" "$BCS_DECRYPTDIR" "$BCS_COMPRESDIR"
 
@@ -81,10 +88,10 @@ esac
 
 # Update runtime data to persistence file
 runtime_data=$(jo bcs_source="$bcs_source" \
-                  start_timestamp="$start_timestamp" \
-                  start_timestamp_running="$start_timestamp_running" \
-                  last_timestamp="$last_timestamp" \
-                  last_timestamp_running="$last_timestamp_running" \
+                  start_timestamp=$start_timestamp \
+                  start_timestamp_running=$start_timestamp_running \
+                  last_timestamp=$last_timestamp \
+                  last_timestamp_running=0 \
                   source_size_running="$(( source_size_running + source_actual_size ))" \
                   dest_size_running="$(( dest_size_running + dest_actual_size ))" \
                   archive_volumes=$(( archive_volumes + 1 )) )

scripts/bacchus-restore.sh

@@ -74,17 +74,17 @@ fi
 
 # Process first (possibly only) backup volume
 echo "$BCS_BASENAME".tar
-timestamp="$(date +%s)"
+timestamp=$(date +%s)
 
 source="$BCS_SOURCE"/"$BCS_BASENAME".tar
 Process_Volume "$BCS_BASENAME".tar "$BCS_DECRYPTDIR" "$BCS_COMPRESDIR"
 
 # Populate external data structure with starting values
 export BCS_DATAFILE="$BCS_TMPFILE".runtime
 runtime_data=$(jo bcs_source="$BCS_SOURCE" \
-                  start_timestamp="$timestamp" \
+                  start_timestamp=$timestamp \
                   start_timestamp_running=0 \
-                  last_timestamp="$timestamp" \
+                  last_timestamp=$timestamp \
                   last_timestamp_running=0 \
                   source_size_running=$source_actual_size \
                   dest_size_running=$dest_actual_size \

scripts/include/backup/completion_stats.sh

@@ -8,6 +8,7 @@ function Completion_Stats()
   #
   # start_timestamp
   # source_size_running
+  # dest_size_running
   # bcs_dest
 
   local completion_timestamp
@@ -19,12 +20,12 @@ function Completion_Stats()
   local comp_ratio
 
   completion_timestamp=$(date +%s)
-  completion_time=$(( completion_timestamp - start_timestamp + start_timestamp_running ))
+  completion_time=$(( completion_timestamp - start_timestamp - start_timestamp_running ))
   avg_archive_time=$(( (completion_time / (TAR_VOLUME - 1) ) ))
 
   source_size_running_text=$(printf "%'.0f" "$source_size_running")
 
-  dest_size=$(du -c "$bcs_dest"/"$BCS_BASENAME"* | tail -1 | awk '{ print $1 }')
+  dest_size=$(( dest_size_running + $(du -c "$bcs_dest"/"$BCS_BASENAME"* | tail -1 | awk '{ print $1 }') ))
   dest_size_text=$(printf "%'.0f" "$dest_size")
 
   comp_ratio=$(( 100 - ( (dest_size * 100) / source_size_running) ))
@@ -34,6 +35,10 @@ function Completion_Stats()
   printf 'Average time per archive file: %s\n' "$(Duration_Readable $avg_archive_time)"
   printf 'Number of archive files:       %s\n' "$(( TAR_VOLUME - 1 ))"
   printf 'Total space backed up:         %sk\n' "$source_size_running_text"
-  printf 'Total space on destination:    %sk\n' "$dest_size_text"
+  if [ "$dest_size_running" -ne 0 ]; then
+    printf 'Total space on destinations:   %sk\n' "$dest_size_text"
+  else
+    printf 'Total space on destination:    %sk\n' "$dest_size_text"
+  fi
   printf 'Overall compression ratio:     %s%%\n' "$comp_ratio"
 }

scripts/include/restore/completion_stats.sh

@@ -9,26 +9,26 @@ function Completion_Stats()
   # dest_size_running
 
   local completion_timestamp
-  local diff_time
+  local completion_time
   local avg_archive_time
   local source_size_running_text
   local dest_size_running_text
   local comp_ratio
 
-  completion_timestamp="$(date +%s)"
-  diff_time=$(( completion_timestamp - start_timestamp ))
-  avg_archive_time=$(( (diff_time / archive_volumes) ))
+  completion_timestamp=$(date +%s)
+  completion_time=$(( completion_timestamp - start_timestamp - start_timestamp_running ))
+  avg_archive_time=$(( (completion_time / archive_volumes) ))
 
   source_size_running_text=$(printf "%'.0f" "$source_size_running")
   dest_size_running_text=$(printf "%'.0f" "$dest_size_running")
 
   comp_ratio=$(( 100 - ( (source_size_running * 100) / dest_size_running) ))
 
   printf '\nRESTORE OPERATION COMPLETE\n'
-  printf 'Total runtime:                 %s\n' "$(Duration_Readable $diff_time)"
+  printf 'Total runtime:                 %s\n' "$(Duration_Readable $completion_time)"
   printf 'Average time per archive file: %s\n' "$(Duration_Readable $avg_archive_time)"
   printf 'Number of archive files:       %s\n' "$archive_volumes"
-  printf 'Total space restored:          %sk\n' "$source_size_running_text"
-  printf 'Total space on source:         %sk\n' "$dest_size_running_text"
+  printf 'Total space on source:         %sk\n' "$source_size_running_text"
+  printf 'Total space restored:          %sk\n' "$dest_size_running_text"
   printf 'Overall compression ratio:     %s%%\n' "$comp_ratio"
 }

scripts/include/restore/incremental_stats.sh

@@ -13,9 +13,9 @@ function Incremental_Stats()
 
   local archive_max_name
   local max_source_size_text
-  local completion_timestamp
-  local diff_time
-  local last_time
+  local incremental_timestamp
+  local elapsed_time
+  local incremental_time
   local avg_archive_time
   local comp_ratio
   local source_size_running_text
@@ -24,10 +24,10 @@ function Incremental_Stats()
   archive_max_name=$(( ${#BCS_BASENAME} + 10 ))
   max_source_size_text=$(( 20 ))
 
-  completion_timestamp="$(date +%s)"
-  diff_time=$(( completion_timestamp - start_timestamp ))
-  last_time=$(( completion_timestamp - last_timestamp ))
-  avg_archive_time=$(( (diff_time / (TAR_VOLUME - 1) ) ))
+  incremental_timestamp=$(date +%s)
+  elapsed_time=$(( incremental_timestamp - start_timestamp - start_timestamp_running ))
+  incremental_time=$(( incremental_timestamp - last_timestamp - last_timestamp_running ))
+  avg_archive_time=$(( (elapsed_time / (TAR_VOLUME - 1) ) ))
 
   comp_ratio=$(( 100 - ( (source_size_running * 100) / dest_size_running) ))
   source_size_running_text=$(printf "%'.0f" "$source_size_running")
@@ -44,11 +44,11 @@ function Incremental_Stats()
 %-${max_source_size_text}s \
 %(%m-%d-%Y %H:%M:%S)T\n" \
     "$filename" \
-    "elapsed..$(Duration_Readable $diff_time)" \
-    "last..$(Duration_Readable $last_time)" \
+    "elapsed..$(Duration_Readable $elapsed_time)" \
+    "last..$(Duration_Readable $incremental_time)" \
     "avg..$(Duration_Readable $avg_archive_time)" \
     "compr..${comp_ratio}%" \
     "source..${source_size_running_text}k" \
     "dest..${dest_size_running_text}k" \
-    "$completion_timestamp"
+    "$incremental_timestamp"
 }