Fixing special directory backups to be per host

Author: sridharavinash

share/github-backup-utils/ghe-backup-repositories-cluster-ng

@@ -295,6 +295,29 @@ RULES
 + /*/nw/??/??/??/*/*.git/objects/**
 RULES
 
+ echo 1>&3
+
+}
+
+# rsync all the repositories
+bm_start "$(basename $0) - Repo sync"
+for file_list in $tempdir/*.rsync; do
+  hostname=$(basename $file_list .rsync)
+
+  repo_num=$(cat $file_list | wc -l)
+  echo "* Transferring $repo_num repositories from $hostname"
+
+  sync_data $hostname $file_list &
+done
+wait
+bm_end "$(basename $0) - Repo sync"
+
+# Since there are no routes for special data directories
+# or archived repositories, we need to do this serially
+# for all hostnames. Good candidate for future optimizations.
+
+bm_start "$(basename $0) - Special Data Directories Sync"
+for h in $hostnames; do
   # Sync __special__ data directories, including the __alambic_assets__,
   # __hookshot__, and __purgatory__ directories. The __nodeload_archives__,
   # __gitmon__, and __render__ directories are excludes since they act only as
@@ -304,8 +327,8 @@ RULES
   # /data/repositories. All other special user data directories have been moved under
   # the /data/user directory.
   echo 1>&3
-  echo "* Transferring special data directories ..." 1>&3
-  rsync_repository_data $1:122 $2  <<RULES
+  echo "* Transferring special data directories from $h..." 1>&3
+  rsync_repository_data $h:122 -z <<RULES
 - /__nodeload_archives__/
 - /__gitmon__/
 - /__render__/
@@ -315,22 +338,10 @@ RULES
 - /info/lost+found/
 + /info/*
 RULES
- echo 1>&3
-
-}
-
-# rsync all the repositories
-bm_start "$(basename $0) - Repo sync"
-for file_list in $tempdir/*.rsync; do
-  hostname=$(basename $file_list .rsync)
-
-  repo_num=$(cat $file_list | wc -l)
-  echo "* Transferring $repo_num repositories from $hostname"
-
-  sync_data $hostname $file_list &
+  echo 1>&3
 done
-wait
-bm_end "$(basename $0) - Repo sync"
+bm_end "$(basename $0) - Special Data Directories Sync"
+
 
 bm_start "$(basename $0) - Archived Repos"
 ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-backup-archived-repos-routes \