Merge pull request #328 from github/snh/es-cluster-restore

Refresh the existing indices when restoring Elasticsearch indices to cluster

Author: snh

bin/ghe-restore

@@ -344,7 +344,7 @@ elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
 fi
 
 if $cluster; then
-  echo "Restoring ElasticSearch Audit logs"
+  echo "Restoring Elasticsearch Audit logs"
   ghe-restore-es-audit-log "$GHE_HOSTNAME" 1>&3
 
   echo "Restoring hookshot logs ..."

share/github-backup-utils/ghe-backup-es-audit-log

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #/ Usage: ghe-backup-es-audit-log
-#/ Take a backup of audit logs in ElasticSearch.
+#/ Take a backup of audit logs in Elasticsearch.
 #/
 #/ Note: This command typically isn't called directly. It's invoked by
 #/ ghe-backup.

share/github-backup-utils/ghe-backup-es-hookshot

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #/ Usage: ghe-backup-es-hookshot
-#/ Take a backup of hookshot logs in ElasticSearch.
+#/ Take a backup of hookshot logs in Elasticsearch.
 #/
 #/ Note: This command typically isn't called directly. It's invoked by
 #/ ghe-backup.

share/github-backup-utils/ghe-restore-es-audit-log

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 #/ Usage: ghe-restore-es-audit-log
-#/ Take a backup of audit logs in ElasticSearch.
+#/ Restores a backup of audit logs to Elasticsearch.
 #/
 #/ Note: This command typically isn't called directly. It's invoked by
-#/ ghe-backup.
+#/ ghe-restore.
 set -e
 
 # Bring in the backup configuration
@@ -19,14 +19,14 @@ 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/audit_log*"' | cut -d ' ' -f 3 | sort | tail -1)
+last_index=$(ghe-ssh "$GHE_HOSTNAME" 'curl -s "localhost:9201/_cat/indices/audit_log*"' | cut -d ' ' -f 3 | sort | tail -2 | head -1)
 
 indices=$(ls -1 $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/*.gz 2>/dev/null | xargs -I{} -n1 basename {} .gz)
 
 for index in $indices; do
   if [ -z "$last_index" ] || ! [ $index \< $last_index ]; then
-    echo "Restoring $index"
-    gzip -dc $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/$index.gz | ghe-ssh "$GHE_HOSTNAME" "/usr/local/share/enterprise/ghe-es-load-json 'http://localhost:9201/$index'"
+    ghe_verbose "* Restoring $index"
+    gzip -dc $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/$index.gz | ghe-ssh "$GHE_HOSTNAME" "/usr/local/share/enterprise/ghe-es-load-json 'http://localhost:9201/$index'" 1>&3
   fi
 done
 

share/github-backup-utils/ghe-restore-es-hookshot

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #/ Usage: ghe-restore-es-hookshot
-#/ Restores a backup of hookshot logs to ElasticSearch.
+#/ Restores a backup of hookshot logs to Elasticsearch.
 #/
 #/ Note: This command typically isn't called directly. It's invoked by
 #/ ghe-restore.
@@ -19,7 +19,7 @@ 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)
+last_index=$(ghe-ssh "$GHE_HOSTNAME" 'curl -s "localhost:9201/_cat/indices/hookshot-logs-*"' | cut -d ' ' -f 3 | sort | tail -2 | head -1)
 
 indices=$(ls -1 $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/hookshot/*.gz 2>/dev/null | xargs -I{} -n1 basename {} .gz)
 

share/github-backup-utils/ghe-restore-es-tarball

@@ -21,7 +21,7 @@ bm_start "$(basename $0)"
 # us run this script directly.
 : ${GHE_RESTORE_SNAPSHOT:=current}
 
-# Restore ElasticSearch indices from tarball snapshot.
+# Restore Elasticsearch indices from tarball snapshot.
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-es-indices' \
     < "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/elasticsearch.tar" 1>&3