db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-25 09:01:48 +02:00
Code Issues Releases Activity

Make regression tests pass on OSX

Browse Source 
Diffs were generated because of wc that puts some spaces before the
output which is in this case a number of lines. This does not impact
regression tests on Linux/Unix.
This commit is contained in:
Michael Paquier 2014-01-13 12:46:58 +09:00
parent 129b21ca4e
commit 09745505aa
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
expected/option.out
View File

@ -77,5 +77,4 @@ ERROR: option -Z, --compress-data should be a boolean: 'FOO'
ERROR: option --keep-arclog-files should be a 32bit signed integer: 'YES'
ERROR: invalid option "TIMELINEID"
ERROR: invalid option "BACKUP_TARGETS"
ERROR: invalid backup-mode "F''\F"
ERROR: invalid backup-mode "ENV_PATH"

12
sql/backup_restore.sh
View File

@ -182,7 +182,7 @@ fi
echo "diff files in BACKUP_PATH/backup/pg_xlog"
diff -r $PGDATA/pg_xlog $BACKUP_PATH/backup/pg_xlog
echo "# of files in BACKUP_PATH/backup/srvlog"
find $BACKUP_PATH/backup/srvlog -type f | wc -l
find $BACKUP_PATH/backup/srvlog -type f | wc -l | tr -d ' '
# recovery database
pg_ctl start -w -t 3600 > /dev/null 2>&1
@ -205,7 +205,7 @@ fi
echo "diff files in BACKUP_PATH/backup/pg_xlog"
diff -r $PGDATA/pg_xlog $BACKUP_PATH/backup/pg_xlog
echo "# of files in BACKUP_PATH/backup/srvlog"
find $BACKUP_PATH/backup/srvlog -type f | wc -l
find $BACKUP_PATH/backup/srvlog -type f | wc -l | tr -d ' '
# re-recovery database
pg_ctl start -w -t 3600 > /dev/null 2>&1
@ -223,17 +223,17 @@ pg_rman -w -p $TEST_PGPORT backup -b f --verbose -d postgres > $BASE_PATH/result
# Backup of online-WAL should been deleted, but serverlog remain.
echo "# of files in BACKUP_PATH/backup/pg_xlog"
find $BACKUP_PATH/backup/pg_xlog -type f | wc -l
find $BACKUP_PATH/backup/pg_xlog -type f | wc -l | tr -d ' '
echo "# of files in BACKUP_PATH/backup/srvlog"
find $BACKUP_PATH/backup/srvlog -type f | wc -l
find $BACKUP_PATH/backup/srvlog -type f | wc -l | tr -d ' '
# Symbolic links in $ARCLOG_PATH should be deleted.
echo "# of symbolic links in ARCLOG_PATH"
find $ARCLOG_PATH -type l | wc -l
find $ARCLOG_PATH -type l | wc -l | tr -d ' '
# timeline history files are backed up.
echo "# of files in BACKUP_PATH/timeline_history"
find $BACKUP_PATH/timeline_history -type f | wc -l
find $BACKUP_PATH/timeline_history -type f | wc -l | tr -d ' '
# restore with pg_rman
pg_ctl stop -m immediate > /dev/null 2>&1

2
sql/option.sh
View File

@ -66,8 +66,6 @@ echo "TIMELINEID=-1" > $BACKUP_PATH/pg_rman.ini
pg_rman backup --verbose -B $BACKUP_PATH
echo "BACKUP_TARGETS=F" > $BACKUP_PATH/pg_rman.ini
pg_rman backup --verbose -B $BACKUP_PATH
echo "BACKUP_MODE='F''\'\\\F'" > $BACKUP_PATH/pg_rman.ini
pg_rman backup --verbose -B $BACKUP_PATH
# configuration priorityfile check
echo "BACKUP_MODE=ENV_PATH" > $BACKUP_PATH/pg_rman.ini