Merge branch 'master' into lildude/reset-connect-job-run-time

Author: lildude

bin/ghe-host-check

@@ -131,7 +131,7 @@ fi
 
 # backup-utils 2.13 onwards limits support to the current and previous two releases
 # of GitHub Enterprise Server.
-supported_minimum_version="3.1.0"
+supported_minimum_version="3.2.0"
 
 if [ "$(version $version)" -ge "$(version $supported_minimum_version)" ]; then
   supported=1

debian/changelog

@@ -1,3 +1,9 @@
+github-backup-utils (3.4.0) UNRELEASED; urgency=medium
+
+  * Add anchor to usage doc for settings restore #865
+
+ -- Steve Culver <[email protected]>  Tue, 15 Feb 2022 19:25:09 +0000
+
 github-backup-utils (3.3.1) UNRELEASED; urgency=medium
 
   * Fix compat issue with ghe-actions-start during maintenance mode #836

docs/faq.md

@@ -19,4 +19,11 @@ snapshots of all major datastores. These snapshots are used to restore an instan
 to a prior state or set up a new instance without having another always-on GitHub
 Enterprise instance (like the High Availability replica).
 
+### Does taking or restoring a backup impact the GitHub Enterprise Server's performance or operation?
+
+Git background maintenance and garbage collection jobs become paused during the repositories stage of a backup and restore, and the storage stage of a backup. This may result in a backlog of queued maintenance or storage jobs observable in the GitHub Enterprise Server metrics for the duration of those steps. We suggest allowing any backlog to process and drain to 0 before starting another backup run. Repositories that are frequently pushed to may experience performance degradation over time if queued maintenance jobs are not processed.
+
+Backup processes triggered by `backup-utils` running on the GitHub Enterprise Server instance run at a low CPU and IO priority to reduce any user facing impact. You may observe elevated levels of CPU usage, disk IO, and network IO for the duration of a backup run.
+
+
 [1]: https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/

docs/usage.md

@@ -80,6 +80,8 @@ The `ghe-backup` and `ghe-restore` commands also have a verbose output mode
 (`-v`) that lists files as they're being transferred. It's often useful to
 enable when output is logged to a file.
 
+### Restoring settings, TLS certificate, and license 
+
 When restoring to a new GitHub Enterprise Server instance, settings, certificate, and
 license data *are* restored. These settings must be reviewed and saved before
 using the GitHub Enterprise Server to ensure all migrations take place and all required

script/package-deb

@@ -26,6 +26,6 @@ git checkout -q "$PKG_HEAD"
 
 debuild -uc -us 1>&2
 cd ..
-files=$(ls -1 *.deb *.tar.gz *.dsc *.changes)
+files=$(ls -1 *.deb *.tar.xz *.dsc *.changes)
 mv $files ../
 for f in $files; do echo "dist/$f"; done

share/github-backup-utils/version

@@ -1 +1 @@
-3.3.1
+3.4.0

test/test-ghe-host-check.sh

@@ -61,7 +61,8 @@ begin_test "ghe-host-check detects unsupported GitHub Enterprise Server versions
   ! GHE_TEST_REMOTE_VERSION=2.21.0 ghe-host-check
   ! GHE_TEST_REMOTE_VERSION=2.22.0 ghe-host-check
   ! GHE_TEST_REMOTE_VERSION=3.0.0 ghe-host-check
-  GHE_TEST_REMOTE_VERSION=3.1.0 ghe-host-check
+  ! GHE_TEST_REMOTE_VERSION=3.1.0 ghe-host-check
+  GHE_TEST_REMOTE_VERSION=3.2.0 ghe-host-check
   GHE_TEST_REMOTE_VERSION=$BACKUP_UTILS_VERSION ghe-host-check
   GHE_TEST_REMOTE_VERSION=$BACKUP_UTILS_VERSION ghe-host-check
   GHE_TEST_REMOTE_VERSION=$bu_version_major.$bu_version_minor.999 ghe-host-check

test/testlib.sh

@@ -42,7 +42,7 @@ export GHE_BACKUP_CONFIG GHE_DATA_DIR GHE_REMOTE_DATA_DIR GHE_REMOTE_ROOT_DIR
 
 # The default remote appliance version. This may be set in the environment prior
 # to invoking tests to emulate a different remote vm version.
-: ${GHE_TEST_REMOTE_VERSION:=3.3.0.rc1}
+: ${GHE_TEST_REMOTE_VERSION:=3.4.0.rc1}
 export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the