From 0c2fdaaf8b8037ac47d44aa8746bf34ac60d9aae Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Sat, 1 Apr 2023 13:36:01 +0200
Subject: [PATCH] Re-enable grants backup

as bug has been fiexed since 2019

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 backup.sh | 66 +++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/backup.sh b/backup.sh
index 69f0f79..8b05966 100755
--- a/backup.sh
+++ b/backup.sh
@@ -2,52 +2,52 @@
 set -euo pipefail
 
 function step() {
-	echo "[$(date +"%Y-%m-%d %H:%M:%S")] $@"
+  echo "[$(date +"%Y-%m-%d %H:%M:%S")] $@"
 }
 
 [ -z "${MYSQL_PASSWORD:-}" ] && {
-	echo 'No $MYSQL_PASSWORD was set, aborting.'
-	exit 1
+  echo 'No $MYSQL_PASSWORD was set, aborting.'
+  exit 1
 }
 
 while [ 1 ]; do
 
-	# Remove old backups older than N days (default 2d)
-	DELETE_OLDER_THAN=${DELETE_OLDER_THAN:-2}
+  # Remove old backups older than N days (default 2d)
+  DELETE_OLDER_THAN=${DELETE_OLDER_THAN:-2}
 
-	# This directory is exposed by the postgres image
-	TARGET_DIR=/data
+  # This directory is exposed by the postgres image
+  TARGET_DIR=/data
 
-	BACKUP_DATE=$(date +%Y-%m-%d_%H-%M-%S)
+  BACKUP_DATE=$(date +%Y-%m-%d_%H-%M-%S)
 
-	# Collect databases
-	step "Starting backup..."
-	DATABASES=$(mysql \
-		-h "${MYSQL_HOST:-mariadb}" -u "${MYSQL_USER:-root}" -p${MYSQL_PASSWORD} \
-		-B --disable-column-names -e 'SHOW DATABASES' |
-		grep -vE '(information_schema|performance_schema|mysql|tmp)')
+  # Collect databases
+  step "Starting backup..."
+  DATABASES=$(mysql \
+    -h "${MYSQL_HOST:-mariadb}" -u "${MYSQL_USER:-root}" -p${MYSQL_PASSWORD} \
+    -B --disable-column-names -e 'SHOW DATABASES' |
+    grep -vE '(information_schema|performance_schema|mysql|tmp)')
 
-	# Create backup
-	for db_name in ${DATABASES}; do
-		TARGET_FILE="${TARGET_DIR}/${BACKUP_DATE}_${db_name}.sql.gz"
-		step "Creating backup of ${db_name} in ${TARGET_FILE}..."
-		mysqldump \
-			-h "${MYSQL_HOST:-mariadb}" -u "${MYSQL_USER:-root}" -p${MYSQL_PASSWORD} \
-			-a --databases "${db_name}" | gzip >"${TARGET_FILE}"
-	done
+  # Create backup
+  for db_name in ${DATABASES}; do
+    TARGET_FILE="${TARGET_DIR}/${BACKUP_DATE}_${db_name}.sql.gz"
+    step "Creating backup of ${db_name} in ${TARGET_FILE}..."
+    mysqldump \
+      -h "${MYSQL_HOST:-mariadb}" -u "${MYSQL_USER:-root}" -p${MYSQL_PASSWORD} \
+      -a --databases "${db_name}" | gzip >"${TARGET_FILE}"
+  done
 
-	# Dump grants -- Disabled until https://jira.percona.com/browse/PT-1561 is fixed
-	#GRANTS_FILE="${TARGET_DIR}/${BACKUP_DATE}_grants.sql"
-	#step "Creating grants backuo in ${GRANTS_FILE}..."
-	#pt-show-grants -h "${MYSQL_HOST:-mariadb}" -u "${MYSQL_USER:-root}" -p "${MYSQL_PASSWORD}" >"${GRANTS_FILE}"
+  # Dump grants
+  GRANTS_FILE="${TARGET_DIR}/${BACKUP_DATE}_grants.sql"
+  step "Creating grants backup in ${GRANTS_FILE}..."
+  pt-show-grants -h "${MYSQL_HOST:-mariadb}" -u "${MYSQL_USER:-root}" -p "${MYSQL_PASSWORD}" >"${GRANTS_FILE}"
 
-	# Cleanup old backups
-	step "Removing old backups..."
-	find "${TARGET_DIR}" -name '*.sql.gz' -mtime "${DELETE_OLDER_THAN}" -delete
-	find "${TARGET_DIR}" -name '*.sql' -mtime "${DELETE_OLDER_THAN}" -delete
+  # Cleanup old backups
+  step "Removing old backups..."
+  find "${TARGET_DIR}" -name '*.sql.gz' -mtime "${DELETE_OLDER_THAN}" -delete
+  find "${TARGET_DIR}" -name '*.sql' -mtime "${DELETE_OLDER_THAN}" -delete
 
-	# Sleep until next full hour
-	step "I'm done, see ya next hour!"
-	sleep $((3600 - $(date +%s) % 3600))
+  # Sleep until next full hour
+  step "I'm done, see ya next hour!"
+  sleep $((3600 - $(date +%s) % 3600))
 
 done