Commitbf2830b

Artur Zakirov

committed

Fix tests for retention policy. Compare WAL segments without timelineid

1 parent5aded20 commitbf2830bCopy full SHA for bf2830b

File tree

+41

-7

lines changed

+41

-7

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -349,12 +349,10 @@ delete_walfiles(XLogRecPtr oldest_lsn, TimeLineID oldest_tli, bool delete_all)`
`349`	`349`	`* they were originally written, in case this worries you.`
`350`	`350`	`*/`
`351`	`351`	`if (IsXLogFileName(arcde->d_name)\|\|`
`352`		`-IsPartialXLogFileName(arcde->d_name)\|\|`
`353`		`-IsBackupHistoryFileName(arcde->d_name))`
	`352`	`+IsPartialXLogFileName(arcde->d_name))`
`354`	`353`	`{`
`355`	`354`	`if (XLogRecPtrIsInvalid(oldest_lsn)\|\|`
`356`		`-strncmp(arcde->d_name,oldestSegmentNeeded,`
`357`		`-XLOG_FNAME_LEN)<0)`
	`355`	`+strcmp(arcde->d_name+8,oldestSegmentNeeded+8)<0)`
`358`	`356`	`{`
`359`	`357`	`/*`
`360`	`358`	`* Use the original file name again now, including any`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,21 @@ def test_options_4(self):`
`89`	`89`	`self.clean_pb(node)`
`90`	`90`	`self.assertEqual(self.init_pb(node),six.b(""))`
`91`	`91`
`92`		`-# TODO: keep data generations`
	`92`	`+# Command line parameters should override file values`
	`93`	`+self.init_pb(node)`
	`94`	`+withopen(path.join(self.backup_dir(node),"pg_probackup.conf"),"a")asconf:`
	`95`	`+conf.write("REDUNDANCY=1\n")`
	`96`	`+`
	`97`	`+self.assertEqual(`
	`98`	`+self.retention_show(node, ["--redundancy","2"]),`
	`99`	`+six.b("# retention policy\nREDUNDANCY=2\n")`
	`100`	`+)`
	`101`	`+`
	`102`	`+# User cannot send --system-identifier parameter via command line`
	`103`	`+self.assertEqual(`
	`104`	`+self.backup_pb(node,options=["--system-identifier","123"]),`
	`105`	`+six.b("ERROR: option system-identifier cannot be specified in command line\n")`
	`106`	`+)`
`93`	`107`
`94`	`108`	`# invalid value in pg_probackup.conf`
`95`	`109`	`withopen(path.join(self.backup_dir(node),"pg_probackup.conf"),"a")asconf:`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,14 @@ def retention_purge_pb(self, node, options=[]):`
`195`	`195`
`196`	`196`	`returnself.run_pb(options+cmd_list)`
`197`	`197`
	`198`	`+defretention_show(self,node,options=[]):`
	`199`	`+cmd_list= [`
	`200`	`+"-B",self.backup_dir(node),`
	`201`	`+"retention","show",`
	`202`	`+]`
	`203`	`+`
	`204`	`+returnself.run_pb(options+cmd_list)`
	`205`	`+`
`198`	`206`	`defget_control_data(self,node):`
`199`	`207`	`pg_controldata=node.get_bin_path("pg_controldata")`
`200`	`208`	`out_data= {}`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`importunittest`
`2`	`2`	`importos`
`3`	`3`	`fromdatetimeimportdatetime,timedelta`
`4`		`-fromosimportpath`
	`4`	`+fromosimportpath,listdir`
`5`	`5`	`from .pb_libimportProbackupTest`
`6`	`6`	`fromtestgresimportstop_all`
`7`	`7`
`@@ -35,9 +35,23 @@ def test_retention_redundancy_1(self):`
`35`	`35`	`self.assertEqual(len(self.show_pb(node)),4)`
`36`	`36`
`37`	`37`	`# Purge backups`
`38`		`-self.retention_purge_pb(node)`
	`38`	`+log=self.retention_purge_pb(node)`
`39`	`39`	`self.assertEqual(len(self.show_pb(node)),2)`
`40`	`40`
	`41`	`+# Check that WAL segments were deleted`
	`42`	`+min_wal=None`
	`43`	`+max_wal=None`
	`44`	`+forlineinlog.splitlines():`
	`45`	`+ifline.startswith(b"INFO: removed min WAL segment"):`
	`46`	`+min_wal=line[31:-1]`
	`47`	`+elifline.startswith(b"INFO: removed max WAL segment"):`
	`48`	`+max_wal=line[31:-1]`
	`49`	`+forwal_nameinlistdir(path.join(self.backup_dir(node),"wal")):`
	`50`	`+ifnotwal_name.endswith(".backup"):`
	`51`	`+wal_name_b=wal_name.encode('ascii')`
	`52`	`+self.assertEqual(wal_name_b[8:]>min_wal[8:],True)`
	`53`	`+self.assertEqual(wal_name_b[8:]>max_wal[8:],True)`
	`54`	`+`
`41`	`55`	`node.stop()`
`42`	`56`
`43`	`57`	`deftest_retention_window_2(self):`

Comments

(0)