Merge pull request #246 from github/2.7.0-release

rubiojr · web-flow · commit 09cb986a3eab · 2016-08-03T20:47:44.000+02:00
Bump version: 2.7.0
diff --git a/bin/ghe-restore b/bin/ghe-restore
@@ -294,6 +294,9 @@ else
   ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 fi
 
+echo "Restoring hookshot logs ..."
+ghe-restore-es-hookshot "$GHE_HOSTNAME" 1>&3
+
 # Restart an already running memcached to reset the cache after restore
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "Restarting memcached ..." 1>&3
@@ -334,7 +337,8 @@ else
   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
+  echo "if [ -f /usr/local/share/enterprise/ghe-cluster-config-update ]; then /usr/local/share/enterprise/ghe-cluster-config-update -s; else /usr/local/bin/ghe-cluster-config-update -s; fi" |
+  ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 fi
 
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+github-backup-utils (2.7.0) UNRELEASED; urgency=medium
+
+  * GitHub Enterprise 2.7.0 support 
+
+ -- Sergio Rubio <rubiojr@github.com>  Wed, 03 Aug 2016 20:25:31 +0200
+
 github-backup-utils (2.6.4) UNRELEASED; urgency=medium
 
   * Instrument/benchmark backups #238
diff --git a/share/github-backup-utils/ghe-restore-es-hookshot b/share/github-backup-utils/ghe-restore-es-hookshot
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-es-hookshot
+#/ Restores a backup of hookshot logs to ElasticSearch.
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-restore.
+set -e
+
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ $# -lt 1 ] && print_usage
+
+bm_start "$(basename $0)"
+
+GHE_HOSTNAME="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+last_index=$(ghe-ssh "$GHE_HOSTNAME" 'curl -s "localhost:9201/_cat/indices/hookshot-logs-*"' | cut -d ' ' -f 3 | sort | tail -1)
+
+indices=$(ls -1 $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/hookshot/*.gz 2>/dev/null | xargs -I{} -n1 basename {} .gz)
+
+for index in $indices; do
+  if [ -z "$last_index" ] || ! [ $index \< $last_index ]; then
+    ghe_verbose "* Restoring $index"
+    gzip -dc $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/hookshot/$index.gz | ghe-ssh "$GHE_HOSTNAME" "/usr/local/share/enterprise/ghe-es-load-json 'http://localhost:9201/$index'" 1>&3
+  fi
+done
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
@@ -1 +1 @@
-2.6.4
+2.7.0
