Merge pull request #230 from github/fix-git-over-ssh-keys-restore

Clusters: Restore Git over SSH host keys

Author: rubiojr

bin/ghe-restore

@@ -314,6 +314,13 @@ ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_RESTORE_S
 if ! $cluster; then
   echo "Restoring SSH host keys ..."
   ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+else
+  # This will make sure that Git over SSH host keys (babeld) are
+  # copied to all the cluster nodes so babeld uses the same keys.
+  echo "Restoring Git over SSH host keys ..."
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo tar -xpf - -C /data/user/common" < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo chown babeld:babeld /data/user/common/ssh_host_*" 1>&3
+  ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-cluster-config-update -s" 1>&3
 fi
 
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"

test/test-ghe-restore.sh

@@ -466,61 +466,3 @@ begin_test "ghe-restore with tarball strategy"
     echo "$output" | grep -q 'fake ghe-export-repositories data'
 )
 end_test
-
-begin_test "cluster: ghe-restore from v2.4.0 snapshot"
-(
-    set -e
-    rm -rf "$GHE_REMOTE_ROOT_DIR"
-    setup_remote_cluster || exit 0
-    setup_remote_metadata
-
-    # set restore host environ var
-    GHE_RESTORE_HOST=127.0.0.1
-    export GHE_RESTORE_HOST
-
-    # create file used to determine if instance is in maintenance mode.
-    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
-    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
-
-    echo "v2.4.0" > "$GHE_DATA_DIR/current/version"
-
-    # run ghe-restore and write output to file for asserting against
-    if ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
-        cat "$TRASHDIR/restore-out"
-        : ghe-restore should have exited non-zero
-        false
-    fi
-
-    # verify restore error message
-    grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
-)
-end_test
-
-begin_test "cluster: ghe-restore from v2.5.0 snapshot"
-(
-    set -e
-    rm -rf "$GHE_REMOTE_ROOT_DIR"
-    setup_remote_cluster || exit 0
-    setup_remote_metadata
-
-    # set restore host environ var
-    GHE_RESTORE_HOST=127.0.0.1
-    export GHE_RESTORE_HOST
-
-    # create file used to determine if instance is in maintenance mode.
-    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system" "$GHE_REMOTE_DATA_USER_DIR/common"
-    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
-
-    echo "v2.5.0" > "$GHE_DATA_DIR/current/version"
-
-    # run ghe-restore and write output to file for asserting against
-    if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
-        cat "$TRASHDIR/restore-out"
-        : ghe-restore should have exited successfully
-        false
-    fi
-
-    # verify that ghe-backup wrote its version information to the host
-    [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-)
-end_test