NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit69b7a35

committed

Clean up pg_rewind regression test script.

Since commit01f6bb4, TestLib.pm has exported path to tmp_check directory,so let's use that also for the pg_rewind test clusters etc.Also, in master, the $tempdir_short variable has not been used since commit13d856e, which moved the initdb-running code to TestLib.pm.Backpatch to 9.5.

1 parente2b49db commit69b7a35Copy full SHA for 69b7a35

File tree

1 file changed

-19

lines changed

src/bin/pg_rewind
- RewindTest.pm

1 file changed

-19

lines changed

`‎src/bin/pg_rewind/RewindTest.pm‎`

Lines changed: 6 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,22 +62,13 @@ our @EXPORT = qw(`
`62`	`62`	`clean_rewind_test`
`63`	`63`	`);`
`64`	`64`
`65`		`-# A temporary directory created with 'tempdir' is deleted automatically at`
`66`		`-# the end of the tests. You can change it to a constant if you need to keep it`
`67`		`-# for debugging purposes,`
`68`		`-my$testroot = tempdir;`
`69`		`-`
`70`		`-our$test_master_datadir ="$testroot/data_master";`
`71`		`-our$test_standby_datadir ="$testroot/data_standby";`
`72`		`-`
`73`		`-mkdir$testroot;`
	`65`	`+our$test_master_datadir ="$tmp_check/data_master";`
	`66`	`+our$test_standby_datadir ="$tmp_check/data_standby";`
`74`	`67`
`75`	`68`	`# Define non-conflicting ports for both nodes.`
`76`	`69`	`my$port_master =$ENV{PGPORT};`
`77`	`70`	`my$port_standby =$port_master + 1;`
`78`	`71`
`79`		`-my$tempdir_short;`
`80`		`-`
`81`	`72`	`my$connstr_master ="port=$port_master";`
`82`	`73`	`my$connstr_standby ="port=$port_standby";`
`83`	`74`
`@@ -171,8 +162,6 @@ sub append_to_file`
`171`	`162`
`172`	`163`	`subsetup_cluster`
`173`	`164`	`{`
`174`		`-$tempdir_short = tempdir_short;`
`175`		`-`
`176`	`165`	`# Initialize master, data checksums are mandatory`
`177`	`166`	`remove_tree($test_master_datadir);`
`178`	`167`	`standard_initdb($test_master_datadir);`
`@@ -267,9 +256,8 @@ sub run_pg_rewind`
`267`	`256`
`268`	`257`	`# Keep a temporary postgresql.conf for master node or it would be`
`269`	`258`	`# overwritten during the rewind.`
`270`		`-copy(`
`271`		`-"$test_master_datadir/postgresql.conf",`
`272`		`-"$testroot/master-postgresql.conf.tmp");`
	`259`	`+copy("$test_master_datadir/postgresql.conf",`
	`260`	`+"$tmp_check/master-postgresql.conf.tmp");`
`273`	`261`
`274`	`262`	`# Now run pg_rewind`
`275`	`263`	`if ($test_modeeq"local")`
`@@ -302,9 +290,8 @@ sub run_pg_rewind`
`302`	`290`	`}`
`303`	`291`
`304`	`292`	`# Now move back postgresql.conf with old settings`
`305`		`-move(`
`306`		`-"$testroot/master-postgresql.conf.tmp",`
`307`		`-"$test_master_datadir/postgresql.conf");`
	`293`	`+move("$tmp_check/master-postgresql.conf.tmp",`
	`294`	`+"$test_master_datadir/postgresql.conf");`
`308`	`295`
`309`	`296`	`# Plug-in rewound node to the now-promoted standby node`
`310`	`297`	`append_to_file(`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit69b7a35

File tree

1 file changed

1 file changed

`‎src/bin/pg_rewind/RewindTest.pm‎`

0 commit comments