NotificationsYou must be signed in to change notification settings
Fork37
Star150

Commit04f0dd1

committed

introduce clean_on_error() for safer node handling

1 parent06ce6e2 commit04f0dd1Copy full SHA for 04f0dd1

File tree

3 files changed

+41

-18

lines changed

testgres

3 files changed

+41

-18

lines changed

`‎testgres/backup.py‎`

Lines changed: 17 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`
`22`	`22`	`from .utilsimport \`
`23`	`23`	`get_bin_path, \`
`24`		`-execute_utility`
	`24`	`+execute_utility, \`
	`25`	`+clean_on_error`
`25`	`26`
`26`	`27`
`27`	`28`	`classNodeBackup(object):`
`@@ -56,8 +57,8 @@ def __init__(self,`
`56`	`57`	`try:`
`57`	`58`	`xlog_method=XLogMethod(xlog_method)`
`58`	`59`	`exceptValueError:`
`59`		`-raiseBackupException(`
`60`		`-'Invalid xlog_method "{}"'.format(xlog_method))`
	`60`	`+msg='Invalid xlog_method "{}"'.format(xlog_method)`
	`61`	`+raiseBackupException(msg)`
`61`	`62`
`62`	`63`	`# Set default arguments`
`63`	`64`	`username=usernameordefault_username()`
`@@ -144,15 +145,16 @@ def spawn_primary(self, name=None, destroy=True):`
`144`	`145`
`145`	`146`	`# Build a new PostgresNode`
`146`	`147`	`from .nodeimportPostgresNode`
`147`		`-node=PostgresNode(name=name,base_dir=base_dir)`
	`148`	`+withclean_on_error(PostgresNode(name=name,`
	`149`	`+base_dir=base_dir))asnode:`
`148`	`150`
`149`		`-# New nodes should always remove dir tree`
`150`		`-node._should_rm_dirs=True`
	`151`	`+# New nodes should always remove dir tree`
	`152`	`+node._should_rm_dirs=True`
`151`	`153`
`152`		`-node.append_conf(PG_CONF_FILE,"\n")`
`153`		`-node.append_conf(PG_CONF_FILE,"port = {}".format(node.port))`
	`154`	`+node.append_conf(PG_CONF_FILE,"\n")`
	`155`	`+node.append_conf(PG_CONF_FILE,"port = {}".format(node.port))`
`154`	`156`
`155`		`-returnnode`
	`157`	`+returnnode`
`156`	`158`
`157`	`159`	`defspawn_replica(self,name=None,destroy=True,slot=None):`
`158`	`160`	`"""`
`@@ -168,13 +170,14 @@ def spawn_replica(self, name=None, destroy=True, slot=None):`
`168`	`170`	`"""`
`169`	`171`
`170`	`172`	`# Build a new PostgresNode`
`171`		`-node=self.spawn_primary(name=name,destroy=destroy)`
	`173`	`+withclean_on_error(self.spawn_primary(name=name,`
	`174`	`+destroy=destroy))asnode:`
`172`	`175`
`173`		`-# Assign it a master and a recovery file (private magic)`
`174`		`-node._assign_master(self.original_node)`
`175`		`-node._create_recovery_conf(username=self.username,slot=slot)`
	`176`	`+# Assign it a master and a recovery file (private magic)`
	`177`	`+node._assign_master(self.original_node)`
	`178`	`+node._create_recovery_conf(username=self.username,slot=slot)`
`176`	`179`
`177`		`-returnnode`
	`180`	`+returnnode`
`178`	`181`
`179`	`182`	`defcleanup(self):`
`180`	`183`	`ifself._available:`

`‎testgres/node.py‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@`
`61`	`61`	`pg_version_ge, \`
`62`	`62`	`reserve_port, \`
`63`	`63`	`release_port, \`
`64`		`-execute_utility`
	`64`	`+execute_utility, \`
	`65`	`+clean_on_error`
`65`	`66`
`66`	`67`	`from .backupimportNodeBackup`
`67`	`68`
`@@ -979,10 +980,9 @@ def replicate(self, name=None, slot=None, **kwargs):`
`979`	`980`	`base_dir: the base directory for data files and logs`
`980`	`981`	`"""`
`981`	`982`
`982`		`-backup=self.backup(**kwargs)`
`983`		`-`
`984`	`983`	`# transform backup into a replica`
`985`		`-returnbackup.spawn_replica(name=name,destroy=True,slot=slot)`
	`984`	`+withclean_on_error(self.backup(**kwargs))asbackup:`
	`985`	`+returnbackup.spawn_replica(name=name,destroy=True,slot=slot)`
`986`	`986`
`987`	`987`	`defcatchup(self,dbname=None,username=None):`
`988`	`988`	`"""`

`‎testgres/utils.py‎`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`importsubprocess`
`10`	`10`	`importsys`
`11`	`11`
	`12`	`+fromcontextlibimportcontextmanager`
`12`	`13`	`fromdistutils.versionimportLooseVersion`
`13`	`14`
`14`	`15`	`from .configimporttestgres_config`
`@@ -217,4 +218,23 @@ def file_tail(f, num_lines):`
`217`	`218`
`218`	`219`
`219`	`220`	`defeprint(args,*kwargs):`
	`221`	`+"""`
	`222`	`+ Print stuff to stderr.`
	`223`	`+ """`
	`224`	`+`
`220`	`225`	`print(args,file=sys.stderr,*kwargs)`
	`226`	`+`
	`227`	`+`
	`228`	`+@contextmanager`
	`229`	`+defclean_on_error(node):`
	`230`	`+"""`
	`231`	`+ Context manager to wrap PostgresNode and such.`
	`232`	`+ Calls cleanup() method when underlying code raises an exception.`
	`233`	`+ """`
	`234`	`+`
	`235`	`+try:`
	`236`	`+yieldnode`
	`237`	`+exceptException:`
	`238`	`+# TODO: should we wrap this in try-block?`
	`239`	`+node.cleanup()`
	`240`	`+raise`

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!

Commit04f0dd1

File tree

3 files changed

3 files changed

`‎testgres/backup.py‎`

`‎testgres/node.py‎`

`‎testgres/utils.py‎`

0 commit comments