Skip to content

Commit d806be4

Browse files
committed
Merge pull request #130 from github/restore-restart-memcached
Restart memcached after restoring
2 parents cc56033 + 70af02b commit d806be4

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

bin/ghe-restore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,11 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
177177
ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
178178
fi
179179

180-
echo "Restoring Git repositories ..."
181180
# Remove temporary 2.2 storage migration directory if it exists
182181
echo "if [ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
183182
ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
183+
184+
echo "Restoring Git repositories ..."
184185
ghe-restore-repositories-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
185186

186187
echo "Restoring GitHub Pages ..."
@@ -206,6 +207,13 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT
206207
echo "Restoring Elasticsearch indices ..."
207208
ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
208209

210+
# Restart an already running memcached to reset the cache after restore
211+
if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
212+
echo "Restarting memcached ..." 1>&3
213+
echo "sudo restart -q memcached 2>/dev/null || true" |
214+
ghe-ssh "$GHE_HOSTNAME" -- /bin/sh
215+
fi
216+
209217
# When restoring to a host that has already been configured, kick off a
210218
# config run to perform data migrations.
211219
if $instance_configured; then

0 commit comments

Comments
 (0)