summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-24 12:45:07 +0000
committerGerrit Code Review <review@openstack.org>2019-10-24 12:45:07 +0000
commitad623aec1e700f56b520c44e5c366dce10404221 (patch)
tree6d7b4cc5685434238621cdc045553fef3420ac0a
parent16d56a6b2634e8c91f0c4523f8b9052ef0f26c99 (diff)
parent65b27d772be32738a8508ea8e6c07f74f229cdb7 (diff)
downloadkolla-ad623aec1e700f56b520c44e5c366dce10404221.tar.gz
kolla-ad623aec1e700f56b520c44e5c366dce10404221.zip
Merge "Fix mariabackup arguments"
-rw-r--r--docker/mariadb/backup.sh21
1 files changed, 10 insertions, 11 deletions
diff --git a/docker/mariadb/backup.sh b/docker/mariadb/backup.sh
index 8c494a5eb..a039d84e8 100644
--- a/docker/mariadb/backup.sh
+++ b/docker/mariadb/backup.sh
@@ -5,25 +5,24 @@ set -eu
# Execute a full backup
backup_full() {
echo "Taking a full backup"
- mariabackup --defaults-file=/etc/mysql/my.cnf \
- --no-timestamp \
+ mariabackup \
+ --defaults-file=/etc/mysql/my.cnf \
+ --backup \
--stream=xbstream \
- --compress \
- --history=$(date +%d-%m-%Y) ./ > \
- $BACKUP_DIR/mysqlbackup-$(date +%d-%m-%Y-%s).qp.xbc.xbs
+ --history=$(date +%d-%m-%Y) | gzip > \
+ $BACKUP_DIR/mysqlbackup-$(date +%d-%m-%Y-%s).qp.xbc.xbs.gz
}
# Execute an incremental backup
backup_incremental() {
echo "Taking an incremental backup"
- mariabackup --defaults-file=/etc/mysql/my.cnf \
- --no-timestamp \
+ mariabackup \
+ --defaults-file=/etc/mysql/my.cnf \
+ --backup \
--stream=xbstream \
- --compress \
- --incremental \
--incremental-history-name=$(date +%d-%m-%Y) \
- --history=$(date +%d-%m-%Y) ./ > \
- $BACKUP_DIR/incremental-$(date +%H)-mysqlbackup-$(date +%d-%m-%Y-%s).qp.xbc.xbs
+ --history=$(date +%d-%m-%Y) | gzip > \
+ $BACKUP_DIR/incremental-$(date +%H)-mysqlbackup-$(date +%d-%m-%Y-%s).qp.xbc.xbs.gz
}
BACKUP_DIR=/backup/