Commit457e062

committed

Merge branch 'REL_2_5'

2 parents7b62d11 +4505def commit457e062Copy full SHA for 457e062

File tree

+45

-2

lines changed

+45

-2

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1786,13 +1786,16 @@ is_forkname(char name, size_t pos, const char *forkname)`
`1786`	`1786`	`}`
`1787`	`1787`
`1788`	`1788`	`#defineOIDCHARS 10`
	`1789`	`+#defineMAXSEGNO (((uint64_t)1<<32)/RELSEG_SIZE-1)`
	`1790`	`+#defineSEGNOCHARS 5/* when BLCKSZ == (1<<15) */`
`1789`	`1791`
`1790`	`1792`	`/* Set forkName if possible */`
`1791`	`1793`	`bool`
`1792`	`1794`	`set_forkname(pgFile*file)`
`1793`	`1795`	`{`
`1794`	`1796`	`size_ti=0;`
`1795`	`1797`	`uint64_toid=0;/* use 64bit to not check for overflow in a loop */`
	`1798`	`+uint64_tsegno=0;`
`1796`	`1799`
`1797`	`1800`	`/* pretend it is not relation file */`
`1798`	`1801`	`file->relOid=0;`
`@@ -1823,8 +1826,15 @@ set_forkname(pgFile *file)`
`1823`	`1826`	`/* /^\d+(_(vm\|fsm\|init\|ptrack))?\.\d+$/ */`
`1824`	`1827`	`if (file->name[i]=='.'&&isdigit(file->name[i+1]))`
`1825`	`1828`	`{`
	`1829`	`+size_tstart=i+1;`
`1826`	`1830`	`for (i++;isdigit(file->name[i]);i++)`
`1827`		`-;`
	`1831`	`+{`
	`1832`	`+if (i==start&&file->name[i]=='0')`
	`1833`	`+return false;`
	`1834`	`+segno=segno*10+file->name[i]-'0';`
	`1835`	`+}`
	`1836`	`+if (i-start>SEGNOCHARS\|\|segno>MAXSEGNO)`
	`1837`	`+return false;`
`1828`	`1838`	`}`
`1829`	`1839`
`1830`	`1840`	`/* CFS "fork name" */`
`@@ -1843,6 +1853,7 @@ set_forkname(pgFile *file)`
`1843`	`1853`	`}`
`1844`	`1854`
`1845`	`1855`	`file->relOid=oid;`
	`1856`	`+file->segno=segno;`
`1846`	`1857`	`file->is_datafile=file->forkName==none;`
`1847`	`1858`	`return true;`
`1848`	`1859`	`}`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,38 @@`
`13`	`13`
`14`	`14`	`classBackupTest(ProbackupTest,unittest.TestCase):`
`15`	`15`
	`16`	`+deftest_basic_full_backup(self):`
	`17`	`+"""`
	`18`	`+ Just test full backup with at least two segments`
	`19`	`+ """`
	`20`	`+fname=self.id().split('.')[3]`
	`21`	`+node=self.make_simple_node(`
	`22`	`+base_dir=os.path.join(module_name,fname,'node'),`
	`23`	`+initdb_params=['--data-checksums'],`
	`24`	`+# we need to write a lot. Lets speedup a bit.`
	`25`	`+pg_options={"fsync":"off","synchronous_commit":"off"})`
	`26`	`+`
	`27`	`+backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')`
	`28`	`+self.init_pb(backup_dir)`
	`29`	`+self.add_instance(backup_dir,'node',node)`
	`30`	`+self.set_archiving(backup_dir,'node',node)`
	`31`	`+node.slow_start()`
	`32`	`+`
	`33`	`+# Fill with data`
	`34`	`+# Have to use scale=100 to create second segment.`
	`35`	`+node.pgbench_init(scale=100,no_vacuum=True)`
	`36`	`+`
	`37`	`+# FULL`
	`38`	`+backup_id=self.backup_node(backup_dir,'node',node)`
	`39`	`+`
	`40`	`+out=self.validate_pb(backup_dir,'node',backup_id)`
	`41`	`+self.assertIn(`
	`42`	`+"INFO: Backup {0} is valid".format(backup_id),`
	`43`	`+out)`
	`44`	`+`
	`45`	`+# Clean after yourself`
	`46`	`+self.del_test_dir(module_name,fname)`
	`47`	`+`
`16`	`48`	`# @unittest.skip("skip")`
`17`	`49`	`# @unittest.expectedFailure`
`18`	`50`	`# PGPRO-707`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`classPtrackTest(ProbackupTest,unittest.TestCase):`
`17`	`17`	`defsetUp(self):`
`18`	`18`	`ifself.pg_config_version<self.version_to_num('11.0'):`
`19`		`-returnunittest.skip('You need PostgreSQL >= 11 for this test')`
	`19`	`+self.skipTest('You need PostgreSQL >= 11 for this test')`
`20`	`20`	`self.fname=self.id().split('.')[3]`
`21`	`21`
`22`	`22`	`# @unittest.skip("skip")`

Comments

(0)