Don't run incremental backups or restores with versions < 3.10 (#471)

Author: gamefiend

bin/ghe-backup

@@ -187,10 +187,15 @@ echo "$GHE_REMOTE_VERSION" > version
 is_inc=$(is_incremental_backup_feature_on)
 
 if [ "$is_inc" = true ]; then
-if [ "$GHE_VERSION_MAJOR" -lt 3 ] && [ "$GHE_VERSION_MINOR" -lt 10 ]; then
-  log_error "Cannot only perform incremental backups on enterprise version 3.10 or higher"
+if [ "$GHE_VERSION_MAJOR" -lt 3 ]; then
+  log_error "Can only perform incremental backups on enterprise version 3.10 or higher"
   exit 1
 fi
+if [ "$GHE_VERSION_MINOR" -lt 10 ]; then
+  log_error "Can only perform incremental backups on enterprise version 3.10 or higher"
+  exit 1
+fi
+
   incremental_backup_check
   # If everything is ok, check if we have hit GHE_MAX_INCREMENTAL_BACKUPS, performing pruning actions if necessary
   check_for_incremental_max_backups

bin/ghe-restore

@@ -326,6 +326,14 @@ START_TIME=$(date +%s)
 log_info "Starting restore of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION from snapshot $GHE_RESTORE_SNAPSHOT"
 
 if [ "$GHE_INCREMENTAL" ]; then
+  if [ "$GHE_VERSION_MAJOR" -lt 3 ]; then
+  log_error "Can only perform incremental restores on enterprise version 3.10 or higher"
+  exit 1
+fi
+if [ "$GHE_VERSION_MINOR" -lt 10 ]; then
+  log_error "Can only perform incremental restores on enterprise version 3.10 or higher"
+  exit 1
+fi
   log_info "Incremental restore from snapshot $GHE_RESTORE_SNAPSHOT"
   # If we see 'inc_previous' prepended to the snapshot name, then
   # we set $INC_FULL_BACKUP and $INC_SNAPSHOT_DATA to $INC_PREVIOUS_FULL_BACKUP and

test/test-ghe-backup.sh

@@ -62,7 +62,7 @@ begin_test "ghe-backup incremental"
 
   # run it
   # this time expect full backup
-  ghe-backup -i
+  GHE_TEST_REMOTE_VERSION=3.10.0 ghe-backup -i
 
   # check metadata files are created
   [ -e "$GHE_DATA_DIR/inc_full_backup" ]
@@ -77,7 +77,7 @@ begin_test "ghe-backup incremental"
 
   # re-run
   # this time expect incremental backup
-  ghe-backup -i
+  GHE_TEST_REMOTE_VERSION=3.10.0 ghe-backup -i
 
   expected_full_backup=$(wc -l < "$GHE_DATA_DIR/inc_full_backup")
   expected_incremental_backup=$(wc -l < "$GHE_DATA_DIR/inc_snapshot_data")
@@ -87,7 +87,7 @@ begin_test "ghe-backup incremental"
 
   # re-run
   # this time expect yet another incremental backup
-  ghe-backup -i
+  GHE_TEST_REMOTE_VERSION=3.10.0 ghe-backup -i
 
   expected_full_backup=$(wc -l < "$GHE_DATA_DIR/inc_full_backup")
   expected_incremental_backup=$(wc -l < "$GHE_DATA_DIR/inc_snapshot_data")
@@ -107,10 +107,23 @@ begin_test "ghe-backup incremental without config"
   export GHE_INCREMENTAL_MAX_BACKUPS=1
 
   # check ghe-backup fails
-  ! ghe-backup -i
+  ! GHE_TEST_REMOTE_VERSION=3.10.0 ghe-backup -i
 )
 end_test
 
+begin_test "ghe-backup performs proper version check"
+(
+  set -e
+  sleep 1
+
+  setup_incremental_backup_config
+
+  #check ghe-backup fails
+  ! GHE_TEST_REMOTE_VERSION=3.9.0 ghe-backup -i
+  ! GHE_TEST_REMOTE_VERSION=3.8.0 ghe-backup -i
+  ! GHE_TEST_REMOTE_VERSION=2.2.0 ghe_backup -i
+)
+
 begin_test "ghe-backup logs the benchmark"
 (
   set -e