Skip to content

Commit d9b90b4

Browse files
gamefienddaxaminmanue1
authored
Cat inc full backups fix (#461)
* Initial commit of incremental backups Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Add more backup functions Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * add restore implementation * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Subject line (try to keep under 50 characters) Multi-line description of commit, feel free to be detailed. * Add basic test * bug fix when checking incremental backup on * functional test * tests for incremental backup * revert version * typo * add end_test * Makes command work in cluster or HA * updating version * Update bin/ghe-restore Co-authored-by: Manuel Bergler <[email protected]> * Put test of version in correct place * implement moving to inc_previous and prune_ * adding incremental max detection * Adding tweaks to restore * remove redis code * tweak pruning * typo fix * Amend pruning test * tweak pruning snapshots * finalizing tweaks to snapshot pruning * troubleshooting * tweaking ghe-prune-snapshots * last tweaks * Resolve #7039 --------- Co-authored-by: Dax Amin <[email protected]> Co-authored-by: Manuel Bergler <[email protected]>
1 parent 5529410 commit d9b90b4

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

‎share/github-backup-utils/ghe-incremental-backup-restore‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -311,23 +311,6 @@ get_cluster_lsn(){
311311
fi
312312
}
313313

314-
# Change our ssh command based on if we are in a cluster or not
315-
# cluster_restore_ssh_cmd(){
316-
# local GHE_HOSTNAME
317-
# GHE_HOSTNAME=$1
318-
319-
# ghe-ssh "$GHE_HOSTNAME" "[ -f /etc/github/cluster ] && [ -z \"$LOCAL_MYSQL\" ]"
320-
321-
# if [ $? -eq 0 ]; then
322-
# local_host=$(ghe-ssh "$GHE_HOSTNAME" "cat /etc/github/cluster")
323-
# mysql_master=$(ghe-ssh "$GHE_HOSTNAME" "ghe-config cluster.mysql-master")
324-
325-
# if [ "$local_host" != "$mysql_master" ]; then
326-
# echo "ssh -p 122 admin@$mysql_master"
327-
# else
328-
# echo ""
329-
# fi
330-
# }
331314

332315
# used to set the previous incremental backups.
333316
# takes every directory in $GHE_DATA_DIR/$INC_FULL_BACKUP and

‎share/github-backup-utils/ghe-restore-mysql-binary‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,13 @@ ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- "sudo mkdir -p '$GHE_REMOTE_
7878
# - for each incremental backup, create a directory in the format:
7979
# $GHE_REMOTE_DATA_USER_DIR/tmp/incremental-restore-snapshot-dir/mysql.sql.gz
8080
# - upload the incremental backup file to the directory
81-
is_full=$(is_full_backup "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT")
82-
is_inc=$(is_incremental_backup_feature_on)
81+
is_full=true
82+
is_inc=false
8383

84+
if [ "$GHE_INCREMENTAL" ]; then
85+
is_full=$(is_full_backup "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT")
86+
is_inc=$(is_incremental_backup_feature_on)
87+
fi
8488
if [ "$is_inc" = true ] && [ "$is_full" = false ]; then
8589
log_info "Uploading incremental backup directories to the remote host ..." 1>&3
8690
full_backup_dir=$(get_full_backup)
@@ -109,6 +113,7 @@ if [ "$is_inc" = true ] && [ "$is_full" = false ]; then
109113
echo "cat $GHE_REMOTE_DATA_USER_DIR/tmp/mysql.sql.gz | $IMPORT_MYSQL" | ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- /bin/bash 1>&3
110114

111115

116+
112117
else
113118
log_info "Uploading $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/mysql.sql.gz MySQL data to the remote host $GHE_RESTORE_HOST in $GHE_REMOTE_DATA_USER_DIR/tmp/mysql.sql.gz ..." 1>&3
114119
cat $snapshot_dir/mysql.sql.gz | ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- "sudo dd of=$GHE_REMOTE_DATA_USER_DIR/tmp/mysql.sql.gz >/dev/null 2>&1"

0 commit comments

Comments
 (0)