From 7fb2924968f3b0fed850dd5999a9bac5947b8ff7 Mon Sep 17 00:00:00 2001 From: kaiyou Date: Sat, 25 Apr 2020 11:48:09 +0200 Subject: [PATCH] improve the db checkpoint scripts --- config/mysql_checkpoint.sh | 3 +-- config/pgsql_checkpoint.sh | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/mysql_checkpoint.sh b/config/mysql_checkpoint.sh index 13030ee..d2ac3bc 100755 --- a/config/mysql_checkpoint.sh +++ b/config/mysql_checkpoint.sh @@ -3,11 +3,10 @@ PROJECTDIR=$1 BASEDIR=${2:-.} SERVICE=${3:-db} -BACKUP=$(date +%s) cd $PROJECTDIR docker-compose stop $SERVICE rm $BASEDIR/wal/* -tar -zcf $BASEDIR/wal/$BACKUP.tar.gz $BASEDIR/db +tar -zcf $BASEDIR/wal/$(date +%s).tar.gz $BASEDIR/db docker-compose up -d $SERVICE ls -lah $BASEDIR/wal \ No newline at end of file diff --git a/config/pgsql_checkpoint.sh b/config/pgsql_checkpoint.sh index 8f30a4a..2944df7 100755 --- a/config/pgsql_checkpoint.sh +++ b/config/pgsql_checkpoint.sh @@ -4,10 +4,10 @@ PROJECTDIR=$1 USER=$2 BASEDIR=${3:-.} SERVICE=${4:-db} -BACKUP=$(date +%s) cd $PROJECTDIR rm -rf $(find $BASEDIR/wal -mindepth 1 -type d) -docker-compose exec $SERVICE pg_basebackup -D /wal/$BACKUP -l $BACKUP -F t -z -P -U $USER -find $BASEDIR/wal -type f ! -newer $BASEDIR/wal/*.$BACKUP ! -name "*.$BACKUP" -exec rm {} \; +docker-compose exec $SERVICE pg_basebackup -D /wal/$(date +%s) -F t -z -P -U $USER +current=$(ls $BASEDIR/wal | grep 'backup$' | tail -n 1) +find $BASEDIR/wal -type f ! -newer $current ! -name $current -exec rm {} \; ls -lah $BASEDIR/wal \ No newline at end of file -- GitLab