From 9d5b053e4a9214d6373511dcf25150e5d1e6b3e2 Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Mon, 11 Apr 2022 12:12:09 +0200
Subject: [PATCH 1/4] Making the MySQL dump command for routine back-ups less
 aggressive.

---
 .../templates/regular-backups.sh.j2                         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2 b/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
index 901cfcf7..64580c3f 100644
--- a/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
+++ b/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
@@ -10,7 +10,9 @@ TARBALL="$DB_NAME-$(date -Iseconds).sql.bz2"
 KEEP=$(({{ database.original.backup.keep | default(cron_mysql_backup.keep) }}+1))
 
 backup(){
-  mysqldump -u"$DBUSER" -p"$DBPASSWORD" -h"$DBHOST" "$CURRENT_DBNAME" | bzip2 > "$TARGET_DIR/$TARBALL"
+  mysqldump --max-allowed-packet=128M --single-transaction --skip-opt -e --quick \
+	    --skip-disable-keys --skip-add-locks -C -a --add-drop-table \
+	    -u"$DBUSER" -p"$DBPASSWORD" -h"$DBHOST" "$CURRENT_DBNAME" | bzip2 > "$TARGET_DIR/$TARBALL"
   ln -sfn "$TARGET_DIR/$TARBALL" "$TARGET_DIR/$DB_NAME"
 }
 
@@ -23,4 +25,4 @@ cleanup(){
 }
 
 backup
-cleanup
\ No newline at end of file
+cleanup

From 680fbd897f885347e61169a68c9b138e68084cd6 Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Mon, 11 Apr 2022 13:48:13 +0200
Subject: [PATCH 2/4] Making max_allowed_packets a variable we can set.

---
 .../cron_database_backup-mysql/defaults/main.yml                | 1 +
 .../cron_database_backup-mysql/templates/regular-backups.sh.j2  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml b/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
index c6c57269..430bff29 100644
--- a/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
+++ b/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
@@ -2,3 +2,4 @@
 cron_mysql_backup:
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/regular"
   keep: 10
+  max_allowed_packets: 128M # Needs to be larger than the single largest database row
diff --git a/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2 b/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
index 64580c3f..ecae0457 100644
--- a/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
+++ b/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
@@ -10,7 +10,7 @@ TARBALL="$DB_NAME-$(date -Iseconds).sql.bz2"
 KEEP=$(({{ database.original.backup.keep | default(cron_mysql_backup.keep) }}+1))
 
 backup(){
-  mysqldump --max-allowed-packet=128M --single-transaction --skip-opt -e --quick \
+  mysqldump --max-allowed-packet={{ cron_mysql_backup.max_allowed_packets }} --single-transaction --skip-opt -e --quick \
 	    --skip-disable-keys --skip-add-locks -C -a --add-drop-table \
 	    -u"$DBUSER" -p"$DBPASSWORD" -h"$DBHOST" "$CURRENT_DBNAME" | bzip2 > "$TARGET_DIR/$TARBALL"
   ln -sfn "$TARGET_DIR/$TARBALL" "$TARGET_DIR/$DB_NAME"

From f9366aac9aaf72f84066a8b8e52d242ea2a5cd81 Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Wed, 20 Apr 2022 11:24:22 +0200
Subject: [PATCH 3/4] Adding dump command to a re-usable central var.

---
 roles/_init/defaults/main.yml                                  | 1 +
 .../cron_database_backup-mysql/defaults/main.yml               | 2 +-
 .../cron_database_backup-mysql/templates/regular-backups.sh.j2 | 3 +--
 roles/database_backup/database_backup-mysql/defaults/main.yml  | 1 +
 .../database_backup-mysql/tasks/deploy-dump.yml                | 2 +-
 .../database_backup-mysql/tasks/deploy-rolling.yml             | 2 +-
 roles/sync/database_sync/database_sync-mysql/defaults/main.yml | 1 +
 roles/sync/database_sync/database_sync-mysql/tasks/sync.yml    | 2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/roles/_init/defaults/main.yml b/roles/_init/defaults/main.yml
index 06470a09..27f0c705 100644
--- a/roles/_init/defaults/main.yml
+++ b/roles/_init/defaults/main.yml
@@ -2,6 +2,7 @@
 # Common defaults. Given the "_init" role is mandatory,
 # this will ensure defaults to other roles too.
 deploy_user: "deploy"
+mysqldump_command: "mysqldump --max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
 drupal:
   sites:
     - folder: "default"
diff --git a/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml b/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
index 430bff29..b79cadfa 100644
--- a/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
+++ b/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
@@ -2,4 +2,4 @@
 cron_mysql_backup:
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/regular"
   keep: 10
-  max_allowed_packets: 128M # Needs to be larger than the single largest database row
+  mysqldump_command: "{{ mysqldump_command }}" # set in _init but you can override here
diff --git a/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2 b/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
index ecae0457..fb60cdea 100644
--- a/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
+++ b/roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2
@@ -10,8 +10,7 @@ TARBALL="$DB_NAME-$(date -Iseconds).sql.bz2"
 KEEP=$(({{ database.original.backup.keep | default(cron_mysql_backup.keep) }}+1))
 
 backup(){
-  mysqldump --max-allowed-packet={{ cron_mysql_backup.max_allowed_packets }} --single-transaction --skip-opt -e --quick \
-	    --skip-disable-keys --skip-add-locks -C -a --add-drop-table \
+  {{ cron_mysql_backup.mysqldump_command }} \
 	    -u"$DBUSER" -p"$DBPASSWORD" -h"$DBHOST" "$CURRENT_DBNAME" | bzip2 > "$TARGET_DIR/$TARBALL"
   ln -sfn "$TARGET_DIR/$TARBALL" "$TARGET_DIR/$DB_NAME"
 }
diff --git a/roles/database_backup/database_backup-mysql/defaults/main.yml b/roles/database_backup/database_backup-mysql/defaults/main.yml
index 3ad97b6c..775fb2a6 100644
--- a/roles/database_backup/database_backup-mysql/defaults/main.yml
+++ b/roles/database_backup/database_backup-mysql/defaults/main.yml
@@ -2,6 +2,7 @@
 mysql_backup:
   handling: rolling
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/build"
+  mysqldump_command: "{{ mysqldump_command }}" # set in _init but you can override here
   # Number of dumps/db to keep. Note this is independant from the build codebases.
   keep: 10
   # This can be one of the following:
diff --git a/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml b/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml
index 4b470b89..57a46e2e 100644
--- a/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml
+++ b/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml
@@ -15,6 +15,6 @@
   run_once: true
 
 - name: Take a database dump.
-  shell: "mysqldump --defaults-extra-file={{ database.credentials_file }} {{ database.database }} | bzip2 > {{ mysql_backup.dumps_directory }}/{{ _mysql_host }}/{{ database.database }}-{{ previous_build_number }}.sql.bz2"
+  shell: "{{ mysql_backup.mysqldump_command }} --defaults-extra-file={{ database.credentials_file }} {{ database.database }} | bzip2 > {{ mysql_backup.dumps_directory }}/{{ _mysql_host }}/{{ database.database }}-{{ previous_build_number }}.sql.bz2"
   when: previous_build_number > 0
   run_once: true
diff --git a/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml b/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml
index fe32089a..cbade053 100644
--- a/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml
+++ b/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml
@@ -12,6 +12,6 @@
   run_once: true
 
 - name: Populate new database.
-  shell: "mysqldump --defaults-extra-file={{ database.credentials_file }} {{ _mysql_previous_build_database_name }} | mysql --defaults-extra-file={{ database.credentials_file }} {{ _mysql_build_database_name }}"
+  shell: "{{ mysql_backup.mysqldump_command }} --defaults-extra-file={{ database.credentials_file }} {{ _mysql_previous_build_database_name }} | mysql --defaults-extra-file={{ database.credentials_file }} {{ _mysql_build_database_name }}"
   when: previous_build_number > 0
   run_once: true
diff --git a/roles/sync/database_sync/database_sync-mysql/defaults/main.yml b/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
index 48e3e4a0..e1a36e34 100644
--- a/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
+++ b/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 mysql_sync:
+  mysqldump_command: "{{ mysqldump_command }}" # set in _init but you can override here
   databases:
     - source:
         # Name of the database to take a dump from.
diff --git a/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml b/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml
index b8182bc3..778092bc 100644
--- a/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml
+++ b/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml
@@ -67,7 +67,7 @@
   when: not database.source.type == 'rolling'
 
 - name: Take a dump from source database.
-  shell: "mysqldump --defaults-extra-file={{ database.source.credentials_file }} {{ mysql_sync_source_database }} | bzip2 > {{ mysql_sync_source_dump_path }}"
+  shell: "{{ mysql_sync.mysqldump_command }} --defaults-extra-file={{ database.source.credentials_file }} {{ mysql_sync_source_database }} | bzip2 > {{ mysql_sync_source_dump_path }}"
   delegate_to: "{{ database.source.host }}"
   when:
     - not database.source.type == 'dump'

From 11c7db5f9041c8aad17e9921fb37d00eb6c8c727 Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Wed, 20 Apr 2022 11:36:01 +0200
Subject: [PATCH 4/4] Renaming _init var so it's easier to distinguish in the
 code.

---
 roles/_init/defaults/main.yml                                   | 2 +-
 .../cron_database_backup-mysql/defaults/main.yml                | 2 +-
 roles/database_backup/database_backup-mysql/defaults/main.yml   | 2 +-
 roles/sync/database_sync/database_sync-mysql/defaults/main.yml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/_init/defaults/main.yml b/roles/_init/defaults/main.yml
index 27f0c705..9821f131 100644
--- a/roles/_init/defaults/main.yml
+++ b/roles/_init/defaults/main.yml
@@ -2,7 +2,7 @@
 # Common defaults. Given the "_init" role is mandatory,
 # this will ensure defaults to other roles too.
 deploy_user: "deploy"
-mysqldump_command: "mysqldump --max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
+_mysqldump_command: "mysqldump --max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
 drupal:
   sites:
     - folder: "default"
diff --git a/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml b/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
index b79cadfa..29b8003b 100644
--- a/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
+++ b/roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml
@@ -2,4 +2,4 @@
 cron_mysql_backup:
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/regular"
   keep: 10
-  mysqldump_command: "{{ mysqldump_command }}" # set in _init but you can override here
+  mysqldump_command: "{{ _mysqldump_command }}" # set in _init but you can override here
diff --git a/roles/database_backup/database_backup-mysql/defaults/main.yml b/roles/database_backup/database_backup-mysql/defaults/main.yml
index 775fb2a6..09f44ca3 100644
--- a/roles/database_backup/database_backup-mysql/defaults/main.yml
+++ b/roles/database_backup/database_backup-mysql/defaults/main.yml
@@ -2,7 +2,7 @@
 mysql_backup:
   handling: rolling
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/build"
-  mysqldump_command: "{{ mysqldump_command }}" # set in _init but you can override here
+  mysqldump_command: "{{ _mysqldump_command }}" # set in _init but you can override here
   # Number of dumps/db to keep. Note this is independant from the build codebases.
   keep: 10
   # This can be one of the following:
diff --git a/roles/sync/database_sync/database_sync-mysql/defaults/main.yml b/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
index e1a36e34..008f0cf4 100644
--- a/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
+++ b/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 mysql_sync:
-  mysqldump_command: "{{ mysqldump_command }}" # set in _init but you can override here
+  mysqldump_command: "{{ _mysqldump_command }}" # set in _init but you can override here
   databases:
     - source:
         # Name of the database to take a dump from.