Skip to content

Commit 5200c89

Browse files
rubiojrrubiojr
authored
Merge pull request github#261 from github/release-2.8.0
Bump version: 2.8.0
2 parents 5e69b4e + 8071f7a commit 5200c89

10 files changed

+93
-24
lines changed

‎debian/changelog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
github-backup-utils (2.8.0) UNRELEASED; urgency=low
2+
3+
* Adds support for GitHub Enterprise 2.8.0
4+
* Speedup storage restores #247
5+
* More portable backup-utils #260
6+
7+
-- rubiojr <rubiojr@github.com> Wed, 09 Nov 2016 06:35:21 -0800
8+
19
github-backup-utils (2.7.1) UNRELEASED; urgency=medium
210

311
* Cluster: fix offline cluster node detection #250

‎share/github-backup-utils/ghe-backup-repositories-cluster-ng

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ user="${host%@*}"
7474
[ "$user" = "$host" ] && user="admin"
7575

7676
# git server hostnames
77-
hostnames=$(ghe_cluster_online_nodes "git-server")
77+
hostnames=$(ghe-cluster-hostnames "$GHE_HOSTNAME" "git-server")
7878
for hostname in $hostnames; do
7979
config="$config
8080
Host $hostname
@@ -171,7 +171,6 @@ rsync_repository_data () {
171171
"$host:$GHE_REMOTE_DATA_USER_DIR/repositories/" \
172172
"$backup_dir" 1>&3
173173
fi
174-
175174
}
176175

177176
sync_data (){
@@ -356,7 +355,6 @@ RULES
356355
done
357356
bm_end "$(basename $0) - Special Data Directories Sync"
358357

359-
360358
bm_start "$(basename $0) - Archived Repos"
361359
ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-backup-archived-repos-routes \
362360
| while read route; do

‎share/github-backup-utils/ghe-backup-store-version

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ set -e
88

99
bm_start "$(basename $0)"
1010

11+
version_info="$BACKUP_UTILS_VERSION"
1112
if [ -d $GHE_BACKUP_ROOT/.git ]; then
12-
version_info="$BACKUP_UTILS_VERSION"
1313
ref=$(git --git-dir=$GHE_BACKUP_ROOT/.git rev-parse HEAD || true)
1414
if [ -n "$ref" ]; then
1515
version_info="$version_info:$ref"
1616
fi
17-
echo "$version_info" |
18-
ghe-ssh "$GHE_HOSTNAME" -- "sudo dd of=$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version >/dev/null 2>&1"
1917
fi
2018

19+
echo "$version_info" |
20+
ghe-ssh "$GHE_HOSTNAME" -- "sudo dd of=$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version >/dev/null 2>&1"
21+
2122
bm_end "$(basename $0)"

‎share/github-backup-utils/ghe-cluster-hostnames

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env bash
2+
#/ Usage: ghe-cluster-hostnames <host> <prefix>
3+
#/
4+
#/ Finds all nodes of the cluster using the config on <host>.
5+
#/ If it is a 2.8 cluster the results are returned as prefix-uuid,
6+
#/ otherwise the configured hostnames are returned.
7+
#/
8+
#/ Note: This script typically isn't called directly. It's invoked by the
9+
#/ ghe-restore-* commands when restoring into a cluster.
10+
set -e
11+
12+
# Bring in the backup configuration
13+
. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
14+
15+
# Show usage and bail with no arguments
16+
[ -z "$*" ] && print_usage
17+
18+
GHE_HOSTNAME="$1"
19+
prefix="$2"
20+
21+
if ghe-ssh "$GHE_HOSTNAME" test -f /data/user/common/uuid; then
22+
node_uuids=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.uuid | cut -d ' ' -f 2)
23+
hostnames=''
24+
for uuid in $node_uuids; do
25+
hostnames+="$prefix-$uuid "
26+
done
27+
else
28+
hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
29+
fi
30+
31+
echo "$hostnames"

‎share/github-backup-utils/ghe-restore-alambic-cluster-ng

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ user="${host%@*}"
4444

4545
# Generate SSH config for forwarding
4646
config=""
47-
hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
48-
for hostname in $hostnames; do
47+
for hostname in $(ghe-cluster-hostnames "$GHE_HOSTNAME" "storage-server"); do
4948
config="$config
5049
Host $hostname
5150
ServerAliveInterval 60

‎share/github-backup-utils/ghe-restore-pages-dpages

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ host=$(ssh_host_part "$GHE_HOSTNAME")
4545
user="${host%@*}"
4646
[ "$user" = "$host" ] && user="admin"
4747

48-
hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
49-
for hostname in $hostnames; do
48+
for hostname in $(ghe-cluster-hostnames "$GHE_HOSTNAME" "pages-server"); do
5049
config="$config
5150
Host $hostname
5251
ServerAliveInterval 60

‎share/github-backup-utils/ghe-restore-repositories-dgit-ng

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,32 @@
66
#/ ghe-restore command when restoring into a cluster.
77
set -e
88

9+
sync_repo_info() {
10+
# node names changed in 2.8 and `ghe-cluster-each -u` isn't available
11+
# on GHE <= 2.7.X. We need to be backwards compatible.
12+
if ghe-ssh "$GHE_HOSTNAME" test -f /data/user/common/uuid; then
13+
for uuid in `ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -u`; do
14+
if ! ghe-rsync -av --delete \
15+
-e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
16+
--rsync-path="sudo -u git rsync" \
17+
"$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info/" \
18+
"git-server-$uuid:$GHE_REMOTE_DATA_USER_DIR/repositories/info" 1>&3; then
19+
echo "Error restoring /data/repositories/info to git-server-$uuid" 1>&2
20+
fi
21+
done
22+
else
23+
for route in `ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -p`; do
24+
if ! ghe-rsync -av --delete \
25+
-e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
26+
--rsync-path="sudo -u git rsync" \
27+
"$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info/" \
28+
"$route:$GHE_REMOTE_DATA_USER_DIR/repositories/info" 1>&3; then
29+
echo "Error restoring /data/repositories/info to $route" 1>&2
30+
fi
31+
done
32+
fi
33+
}
34+
935
# Bring in the backup configuration
1036
. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
1137

@@ -46,7 +72,7 @@ opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecki
4672
tmp_list=$tempdir/tmp_list
4773
to_restore=$tempdir/to_restore
4874

49-
hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
75+
hostnames=$(ghe-cluster-hostnames "$GHE_HOSTNAME" "git-server")
5076
for hostname in $hostnames; do
5177
echo "
5278
Host $hostname
@@ -129,15 +155,7 @@ cat $to_restore | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-restore-
129155

130156
if [ -d $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info ]; then
131157
ghe_verbose "* Transferring repository info data"
132-
for route in `ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -p`; do
133-
if ! ghe-rsync -av --delete \
134-
-e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
135-
--rsync-path="sudo -u git rsync" \
136-
"$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info/" \
137-
"$route:$GHE_REMOTE_DATA_USER_DIR/repositories/info" 1>&3; then
138-
echo "Error restoring /data/repositories/info to $route"
139-
fi
140-
done
158+
sync_repo_info
141159
else
142160
ghe_verbose "* Removing repository info data"
143161
ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -- rm -f /data/repositories/info/*

‎share/github-backup-utils/ghe-restore-repositories-gist-ng

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecki
4646
tmp_list=$tempdir/tmp_list
4747
to_restore=$tempdir/to_restore
4848

49-
hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
50-
for hostname in $hostnames; do
49+
for hostname in $(ghe-cluster-hostnames "$GHE_HOSTNAME" "git-server"); do
5150
echo "
5251
Host $hostname
5352
ServerAliveInterval 60

‎share/github-backup-utils/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.1
1+
2.8.0

‎test/test-ghe-backup.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,26 @@ begin_test "ghe-backup fsck"
441441
)
442442
end_test
443443

444-
begin_test "ghe-backup with leaked SSH host key detection for current backup"
444+
begin_test "ghe-backup stores version when not run from a clone"
445445
(
446446
set -e
447447

448+
# Make sure this doesn't exist
449+
rm -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
450+
451+
mv "$ROOTDIR/.git" "$ROOTDIR/.gittmp"
452+
ghe-backup
453+
mv "$ROOTDIR/.gittmp" "$ROOTDIR/.git"
454+
455+
# verify that ghe-backup wrote its version information to the host
456+
[ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
457+
)
458+
end_test
459+
460+
begin_test "ghe-backup with leaked SSH host key detection for current backup"
461+
(
462+
set -e
463+
448464
SHARED_UTILS_PATH=$(dirname $(which ghe-detect-leaked-ssh-keys))
449465
# Inject the fingerprint into the blacklist
450466
echo 98:d8:99:d3:be:c0:55:05:db:b0:53:2f:1f:ad:b3:60 >> "$SHARED_UTILS_PATH/ghe-ssh-leaked-host-keys-list.txt"

0 commit comments

Comments
 (0)