Skip to content

Commit 8a34a18

Browse files
author
Michael Paquier
committed
Fix regression tests
Postgres 9.3 has introduced the previous timeline ID at last checkpoint in pg_controldata, conflicting with the regression script used here...
1 parent 26b97fb commit 8a34a18

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sql/backup_restore.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ pg_rman validate `date +%Y` --verbose > $BASE_PATH/results/log_validate2 2>&1
170170
pg_rman restore -! --verbose --check > $BASE_PATH/results/log_restore_check_1 2>&1
171171

172172
# restore with pg_rman
173-
CUR_TLI=`pg_controldata | grep TimeLineID | awk '{print $4}'`
173+
CUR_TLI=`pg_controldata | grep "Latest checkpoint's TimeLineID:" | awk '{print $4}'`
174174
pg_rman restore -! --verbose > $BASE_PATH/results/log_restore1_1 2>&1
175175
CUR_TLI_R=`grep "current timeline ID = " $BASE_PATH/results/log_restore1_1 | awk '{print $5}'`
176176
TARGET_TLI=`grep "target timeline ID = " $BASE_PATH/results/log_restore1_1 | awk '{print $5}'`
@@ -193,7 +193,7 @@ pg_ctl stop -m immediate > /dev/null 2>&1
193193
# restore check with pg_rman
194194
pg_rman restore -! --verbose --check > $BASE_PATH/results/log_restore_check_2 2>&1
195195

196-
CUR_TLI=`pg_controldata | grep TimeLineID | awk '{print $4}'`
196+
CUR_TLI=`pg_controldata | grep "Latest checkpoint's TimeLineID:" | awk '{print $4}'`
197197
pg_rman restore -! --verbose > $BASE_PATH/results/log_restore1_2 2>&1
198198
CUR_TLI_R=`grep "current timeline ID = " $BASE_PATH/results/log_restore1_2 | awk '{print $5}'`
199199
TARGET_TLI=`grep "target timeline ID = " $BASE_PATH/results/log_restore1_2 | awk '{print $5}'`
@@ -241,7 +241,7 @@ pg_ctl stop -m immediate > /dev/null 2>&1
241241
# restore check with pg_rman
242242
pg_rman restore -! --verbose --check > $BASE_PATH/results/log_restore_check_3 2>&1
243243

244-
CUR_TLI=`pg_controldata | grep TimeLineID | awk '{print $4}'`
244+
CUR_TLI=`pg_controldata | grep "Latest checkpoint's TimeLineID:" | awk '{print $4}'`
245245
pg_rman restore -! --recovery-target-xid $target_xid --recovery-target-inclusive false --verbose > $BASE_PATH/results/log_restore2 2>&1
246246
CUR_TLI_R=`grep "current timeline ID = " $BASE_PATH/results/log_restore2 | awk '{print $5}'`
247247
TARGET_TLI=`grep "target timeline ID = " $BASE_PATH/results/log_restore2 | awk '{print $5}'`

0 commit comments

Comments
 (0)