Merge pull request #283 from github/upd-backup-size-units

Update Backup transfer_size units displayed in MB

Author: chuckp22

bin/ghe-backup

@@ -284,7 +284,7 @@ fi
 log_info "Checking for leaked ssh keys ..."
 ghe-detect-leaked-ssh-keys -s "$GHE_SNAPSHOT_DIR" || true
 
-log_info "Restore of $GHE_HOSTNAME finished."
+log_info "Backup of $GHE_HOSTNAME finished."
 
 # Remove in-progress file
 ghe_backup_finished

bin/ghe-host-check

@@ -159,7 +159,7 @@ if [[ "$CALLING_SCRIPT" == "ghe-backup" ]]; then
   #Display dir requirements for repositories and mysql
   echo "Checking host for sufficient space for a backup..." 1>&2
   available_space=$(df -B 1k $GHE_DATA_DIR | awk 'END{printf "%.0f", $4 * 1024}') 
-  printf "Available space: %d MB. We recommend allocating at least 5x the amount of storage allocated to the primary GitHub appliance for historical snapshots and growth over time.\n" "$((available_space / 1024 ** 2))" 1>&2
+  echo "We recommend allocating at least 5x the amount of storage allocated to the primary GitHub appliance for historical snapshots and growth over time." 1>&2
 
   repos_disk_size=$(transfer_size repositories /tmp)
   pages_disk_size=$(transfer_size pages /tmp)
@@ -170,17 +170,29 @@ if [[ "$CALLING_SCRIPT" == "ghe-backup" ]]; then
   actions_disk_size=$(transfer_size actions /tmp)
   mssql_disk_size=$(transfer_size mssql /tmp)
 
-  #min_disk_req=$(( $(echo "$repos_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$pages_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$es_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$stor_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$minio_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$mysql_disk_size" | awk '{printf "%.0f", $1/2}') + $(echo "$actions_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$mssql_disk_size" | awk '{printf "%.0f", $1}') ))
-  min_disk_req=$(( $(echo "$repos_disk_size") + $(echo "$pages_disk_size") + $(echo "$es_disk_size") + $(echo "$stor_disk_size") + $(echo "$minio_disk_size") + $(echo "$mysql_disk_size") + $(echo "$actions_disk_size") + $(echo "$mssql_disk_size") ))
-echo -e "### Data Transfer Sizes \nrepositories: $repos_disk_size \npages: $pages_disk_size \nelasticsearch: $es_disk_size \nstorage: $stor_disk_size \nminio: $minio_disk_size \nmysql: $mysql_disk_size \nactions: $actions_disk_size \nmssql: $mssql_disk_size" 1>&2
-  printf "min_disk_required for this backup is at least %d MB\n" "$((min_disk_req / 1024 ** 2))" 1>&2
+  min_disk_req=$((repos_disk_size + pages_disk_size + es_disk_size + stor_disk_size + minio_disk_size + mysql_disk_size + actions_disk_size + mssql_disk_size))
+  echo "Available space: $((available_space / (1024 ** 2))) MB" 1>&2
+  echo -e "Min Disk required for this backup is at least $min_disk_req MB\n" 1>&2
+
+cat <<DATA_TRANSFER_SIZE 1>&2
+### Data Transfer Sizes 
+repositories: $repos_disk_size MB
+pages: $pages_disk_size MB
+elasticsearch: $es_disk_size MB
+storage: $stor_disk_size MB
+minio: $minio_disk_size MB
+mysql: $mysql_disk_size MB
+actions: $actions_disk_size MB
+mssql: $mssql_disk_size MB
+DATA_TRANSFER_SIZE
 
   if [[ $available_space -lt $min_disk_req ]]; then
     echo "There is not enough disk space for the backup. Please allocate more space and continue." 1>&2
     exit 1
   fi
 
   #Check rsync, openssh & jq versions
+  echo "### Software versions" 1>&2
   rsync_version=$(rsync --version | grep 'version' | awk '{print $3}')
   if awk "BEGIN {exit !($rsync_version < $min_rsync)}" &> /dev/null; then
     echo "rsync version $rsync_version in backup-host does not meet minimum requirements." 1>&2

share/github-backup-utils/ghe-rsync-size.sh

@@ -61,15 +61,15 @@ transfer_size()
   total_file_size=$(ghe-rsync -arn --stats \
       -e "ssh -q $GHE_EXTRA_SSH_OPTS -p 122 -l admin" \
       --rsync-path="sudo -u $user rsync" \
-      $link_dest/$1 \
+      "$link_dest"/"$1" \
       --ignore-missing-args \
       "$GHE_HOSTNAME:$data_user_dir/" \
       "$dest_dir/" | grep "Total transferred file size" | sed 's/.*size: //; s/,//g')
 
   # Reduce mysql size as only the compressed file is transferred
   if [[ "$1" == "mysql" ]]; then
-    echo "$total_file_size" | awk '{printf "%.0f\n", $1/2}'
+    echo "$total_file_size" | awk '{if ($1 > 0) printf "%.0f\n", int(($1+999999.5)/2000000); else printf "0\n"}'
   else
-    echo "$total_file_size" | awk '{printf "%.0f\n", $1}'
+    echo "$total_file_size" | awk '{if ($1 > 0) printf "%.0f\n", int(($1+999999.5)/1000000); else printf "0\n"}'
   fi
 }