Switch all relevant GHE_REMOTE_DATA_DIR to GHE_REMOTE_DATA_USER_DIR

Anything that needs the path to a persistent storage location now
uses GHE_REMOTE_DATA_USER_DIR instead of GHE_REMOTE_DATA_DIR.

Author: rtomayko

libexec/ghe-backup-es-rsync

@@ -23,8 +23,8 @@ fi
 mkdir -p "$GHE_SNAPSHOT_DIR/elasticsearch"
 
 # Verify that the /data/elasticsearch directory exists.
-if ! ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_DIR/elasticsearch' ]"; then
-    echo "* The /data/elasticsearch directory doesn't exist." 1>&3
+if ! ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/elasticsearch' ]"; then
+    echo "* The '$GHE_REMOTE_DATA_USER_DIR/elasticsearch' directory doesn't exist." 1>&3
     exit 0
 fi
 
@@ -34,7 +34,7 @@ fi
 # XXX This should be fixed on the appliance side but will need to be maintained
 # for versions up to at least 11.10.343.
 echo "* Retrieving elasticsearch.yml config file ..." 1>&3
-ghe-ssh "$host" -- "sudo grep -F '' '$GHE_REMOTE_DATA_DIR/elasticsearch/elasticsearch.yml'" \
+ghe-ssh "$host" -- "sudo grep -F '' '$GHE_REMOTE_DATA_USER_DIR/elasticsearch/elasticsearch.yml'" \
     > "$GHE_SNAPSHOT_DIR/elasticsearch/elasticsearch.yml"
 chmod 0600 "$GHE_SNAPSHOT_DIR/elasticsearch/elasticsearch.yml"
 
@@ -53,7 +53,7 @@ ghe-rsync -avz \
     --rsync-path='sudo -u git rsync' \
     $link_dest \
     --exclude='elasticsearch.yml' \
-    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_DIR/elasticsearch/" \
+    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_USER_DIR/elasticsearch/" \
     "$GHE_SNAPSHOT_DIR/elasticsearch" 1>&3
 
 # Set up a trap to re-enable flushing on exit
@@ -78,5 +78,5 @@ ghe-rsync -avz \
     --rsync-path='sudo -u git rsync' \
     $link_dest \
     --exclude='elasticsearch.yml' \
-    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_DIR/elasticsearch/" \
+    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_USER_DIR/elasticsearch/" \
     "$GHE_SNAPSHOT_DIR/elasticsearch" 1>&3

libexec/ghe-backup-es-tarball

@@ -13,7 +13,7 @@ cd $(dirname "$0")/..
 # Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
 # directory exists.
 echo "
-    if [ -d '$GHE_REMOTE_DATA_DIR/elasticsearch' ]; then
+    if [ -d '$GHE_REMOTE_DATA_USER_DIR/elasticsearch' ]; then
         ghe-export-es-indices
     else
         tar cvf - --files-from /dev/null

libexec/ghe-backup-pages-rsync

@@ -21,7 +21,7 @@ host="$GHE_HOSTNAME"
 
 # Verify that the /data/pages directory exists. It won't if no pages sites have
 # been published under some versions.
-ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_DIR/pages' ]" || exit 0
+ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/pages' ]" || exit 0
 
 # If we have a previous increment, avoid transferring existing files via rsync's
 # --link-dest support. This also decreases physical space usage considerably.
@@ -36,5 +36,5 @@ ghe-rsync -avz \
     -e "ghe-ssh -p $(ssh_port_part "$host")" \
     --rsync-path='sudo -u git rsync' \
     $link_dest \
-    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_DIR/pages/" \
+    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_USER_DIR/pages/" \
     "$GHE_SNAPSHOT_DIR/pages" 1>&3

libexec/ghe-backup-redis

@@ -20,5 +20,5 @@ ghe-ssh "$GHE_HOSTNAME" /bin/sh <<EOF
     while [ \$(redis-cli LASTSAVE) -eq \$timestamp ]; do
         sleep 1
     done
-    cat '$GHE_REMOTE_DATA_DIR/redis/dump.rdb'
+    cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
 EOF

libexec/ghe-backup-repositories-rsync

@@ -44,7 +44,7 @@ backup_current="$GHE_DATA_DIR/current/repositories"
 
 # Remote sync-in-progress file location. When this file exists, Git GC
 # operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_DIR/repositories/.sync_in_progress"
+sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
 
 # Verify rsync is available.
 if ! rsync --version 1>/dev/null 2>&1; then
@@ -97,7 +97,7 @@ rsync_repository_data () {
         $link_dest "$@" \
         --rsync-path='sudo -u git rsync' \
         --include-from=- --exclude=\* \
-        "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_DIR/repositories/" \
+        "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_USER_DIR/repositories/" \
         "$backup_dir" 1>&3
 }
 

libexec/ghe-restore-es-rsync

@@ -33,10 +33,10 @@ fi
 
 if [ "$GHE_VERSION_MAJOR" -gt 1 ]; then
     cd "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/elasticsearch"
-    ghe-ssh "$host" -- "sudo mkdir -p $GHE_REMOTE_DATA_DIR/elasticsearch-legacy" 1>&3
+    ghe-ssh "$host" -- "sudo mkdir -p '$GHE_REMOTE_DATA_USER_DIR/elasticsearch-legacy'" 1>&3
 
     $TAR -cf - --owner=root --group=root . |
-    ghe-ssh "$host" -- "sudo tar -xf - -C $GHE_REMOTE_DATA_DIR/elasticsearch-legacy" 1>&3
+    ghe-ssh "$host" -- "sudo tar -xf - -C '$GHE_REMOTE_DATA_USER_DIR/elasticsearch-legacy'" 1>&3
 else
     cd "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
     $TAR -cf - --owner=root --group=root elasticsearch |

libexec/ghe-restore-pages-rsync

@@ -27,5 +27,5 @@ if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/pages/" ]; then
       -e "ghe-ssh -p $(ssh_port_part "$host")" \
       --rsync-path="sudo -u git rsync" \
       "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/pages/" \
-      "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_DIR/pages" 1>&3
+      "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_USER_DIR/pages" 1>&3
 fi

libexec/ghe-restore-repositories-rsync

@@ -26,4 +26,4 @@ ghe-rsync -av --delete \
     -e "ghe-ssh -p $(ssh_port_part "$host")" \
     --rsync-path="sudo -u git rsync" \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/" \
-    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_DIR/repositories" 1>&3
+    "$(ssh_host_part "$host"):$GHE_REMOTE_DATA_USER_DIR/repositories" 1>&3

test/bin/redis-cli

@@ -12,8 +12,8 @@ case "$1" in
         date +%s
         ;;
     BGSAVE)
-        mkdir -p "$GHE_REMOTE_DATA_DIR/redis"
-        echo "fake redis data" > "$GHE_REMOTE_DATA_DIR/redis/dump.rdb"
+        mkdir -p "$GHE_REMOTE_DATA_USER_DIR/redis"
+        echo "fake redis data" > "$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb"
         ;;
     *)
         echo "unexpected redis-cli command: $1" 1>&2

test/test-ghe-backup-repositories-rsync.sh

@@ -5,11 +5,11 @@
 . $(dirname "$0")/testlib.sh
 
 # Create the backup data dir and fake remote repositories dirs
-mkdir -p "$GHE_DATA_DIR" "$GHE_REMOTE_DATA_DIR/repositories"
+mkdir -p "$GHE_DATA_DIR" "$GHE_REMOTE_DATA_USER_DIR/repositories"
 mkdir -p "$TRASHDIR/hooks"
 
 # Create some test repositories in the remote repositories dir
-cd "$GHE_REMOTE_DATA_DIR/repositories"
+cd "$GHE_REMOTE_DATA_USER_DIR/repositories"
 mkdir alice bob
 mkdir alice/repo1.git alice/repo2.git bob/repo3.git
 
@@ -57,7 +57,7 @@ begin_test "ghe-backup-repositories-rsync first snapshot"
     [ -f "$GHE_DATA_DIR"/1/repositories/bob/repo3.git/svn_data/property_history.msgpack ]
 
     # verify all repository data was transferred
-    diff -ru "$GHE_REMOTE_DATA_DIR/repositories" "$GHE_DATA_DIR/1/repositories"
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/repositories" "$GHE_DATA_DIR/1/repositories"
 )
 end_test
 
@@ -86,7 +86,7 @@ begin_test "ghe-backup-repositories-rsync subsequent snapshot"
     [ "$inode1" = "$inode2" ]
 
     # verify all repository data exists in the increment
-    diff -ru "$GHE_REMOTE_DATA_DIR/repositories" "$GHE_DATA_DIR/2/repositories"
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/repositories" "$GHE_DATA_DIR/2/repositories"
 )
 end_test
 
@@ -100,13 +100,13 @@ begin_test "ghe-backup-repositories-rsync __special__ dirs"
     export GHE_SNAPSHOT_TIMESTAMP
 
     # create the excluded __nodeload_archives__ dir on the remote side
-    mkdir "$GHE_REMOTE_DATA_DIR/repositories/__nodeload_archives__"
-    touch "$GHE_REMOTE_DATA_DIR/repositories/__nodeload_archives__/something.tar.gz"
+    mkdir "$GHE_REMOTE_DATA_USER_DIR/repositories/__nodeload_archives__"
+    touch "$GHE_REMOTE_DATA_USER_DIR/repositories/__nodeload_archives__/something.tar.gz"
 
     # create the included __purgatory__ dir on the remote side
-    mkdir -p "$GHE_REMOTE_DATA_DIR/repositories/__purgatory__/123.git"
-    git init --bare -q "$GHE_REMOTE_DATA_DIR/repositories/__purgatory__/123.git"
-    git --git-dir="$GHE_REMOTE_DATA_DIR/repositories/__purgatory__/123.git" --work-tree=. \
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories/__purgatory__/123.git"
+    git init --bare -q "$GHE_REMOTE_DATA_USER_DIR/repositories/__purgatory__/123.git"
+    git --git-dir="$GHE_REMOTE_DATA_USER_DIR/repositories/__purgatory__/123.git" --work-tree=. \
         commit --allow-empty -m 'test commit'
 
     # run it
@@ -139,7 +139,7 @@ begin_test "ghe-backup-repositories-rsync temp files"
     export GHE_SNAPSHOT_TIMESTAMP
 
     # create a tmp pack to emulate a pack being written to
-    touch "$GHE_REMOTE_DATA_DIR/repositories/alice/repo1.git/objects/pack/tmp_pack_1234"
+    touch "$GHE_REMOTE_DATA_USER_DIR/repositories/alice/repo1.git/objects/pack/tmp_pack_1234"
 
     # run it
     ghe-backup-repositories-rsync