Commit7153fd3

committed

add 'temp_dir' setting to GlobalConfig

1 parent56f79aa commit7153fd3Copy full SHA for 7153fd3

File tree

+20

-8

lines changed

+20

-8

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`
`3`	`3`	`importos`
`4`	`4`	`importshutil`
`5`		`-importtempfile`
`6`	`5`
`7`	`6`	`fromsiximportraise_from`
	`7`	`+fromtempfileimportmkdtemp`
	`8`	`+`
	`9`	`+from .configimporttestgres_config`
`8`	`10`
`9`	`11`	`from .constsimport \`
`10`	`12`	`DATA_DIR, \`
`@@ -49,9 +51,11 @@ def __init__(self,`
`49`	`51`	`ifnotnode.status():`
`50`	`52`	`raiseBackupException('Node must be running')`
`51`	`53`
	`54`	`+# yapf: disable`
`52`	`55`	`# Set default arguments`
`53`	`56`	`username=usernameordefault_username()`
`54`		`-base_dir=base_dirortempfile.mkdtemp(prefix=TMP_BACKUP)`
	`57`	`+base_dir=base_dirormkdtemp(prefix=TMP_BACKUP,`
	`58`	`+dir=testgres_config.temp_dir)`
`55`	`59`
`56`	`60`	`# public`
`57`	`61`	`self.original_node=node`
`@@ -98,7 +102,8 @@ def _prepare_dir(self, destroy):`
`98`	`102`	`available=notdestroy`
`99`	`103`
`100`	`104`	`ifavailable:`
`101`		`-dest_base_dir=tempfile.mkdtemp(prefix=TMP_NODE)`
	`105`	`+dest_base_dir=mkdtemp(prefix=TMP_NODE,`
	`106`	`+dir=testgres_config.temp_dir)`
`102`	`107`
`103`	`108`	`data1=os.path.join(self.base_dir,DATA_DIR)`
`104`	`109`	`data2=os.path.join(dest_base_dir,DATA_DIR)`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`importatexit`
`4`	`4`	`importcopy`
`5`	`5`	`importshutil`
`6`		`-importtempfile`
`7`	`6`
`8`	`7`	`fromcontextlibimportcontextmanager`
	`8`	`+fromtempfileimportmkdtemp`
`9`	`9`
`10`	`10`	`from .constsimportTMP_CACHE`
`11`	`11`
`@@ -21,6 +21,8 @@ class GlobalConfig(object):`
`21`	`21`
`22`	`22`	`cache_pg_config: shall we cache pg_config results?`
`23`	`23`
	`24`	`+ temp_dir: base temp dir for nodes with default 'base_dir'.`
	`25`	`+`
`24`	`26`	`use_python_logging: use python logging configuration for all nodes.`
`25`	`27`	`error_log_lines: N of log lines to be shown in exception (0=inf).`
`26`	`28`
`@@ -37,6 +39,8 @@ class GlobalConfig(object):`
`37`	`39`
`38`	`40`	`cache_pg_config=True`
`39`	`41`
	`42`	`+temp_dir=None`
	`43`	`+`
`40`	`44`	`use_python_logging=False`
`41`	`45`	`error_log_lines=20`
`42`	`46`
`@@ -166,5 +170,7 @@ def configure_testgres(**options):`
`166`	`170`	`testgres_config.update(options)`
`167`	`171`
`168`	`172`
	`173`	`+# yapf: disable`
`169`	`174`	`# NOTE: assign initial cached dir for initdb`
`170`		`-testgres_config.cached_initdb_dir=tempfile.mkdtemp(prefix=TMP_CACHE)`
	`175`	`+testgres_config.cached_initdb_dir=mkdtemp(prefix=TMP_CACHE,`
	`176`	`+dir=testgres_config.temp_dir)`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`importshutil`
`6`	`6`	`importsix`
`7`	`7`	`importsubprocess`
`8`		`-importtempfile`
`9`	`8`	`importtime`
`10`	`9`
`11`	`10`	`fromenumimportEnum`
`12`	`11`	`fromsiximportraise_from`
	`12`	`+fromtempfileimportmkstemp,mkdtemp`
`13`	`13`
`14`	`14`	`from .cacheimportcached_initdb`
`15`	`15`
`@@ -200,7 +200,8 @@ def _create_recovery_conf(self, username):`
`200`	`200`
`201`	`201`	`def_prepare_dirs(self):`
`202`	`202`	`ifnotself.base_dir:`
`203`		`-self.base_dir=tempfile.mkdtemp(prefix=TMP_NODE)`
	`203`	`+self.base_dir=mkdtemp(prefix=TMP_NODE,`
	`204`	`+dir=testgres_config.temp_dir)`
`204`	`205`
`205`	`206`	`ifnotos.path.exists(self.base_dir):`
`206`	`207`	`os.makedirs(self.base_dir)`
`@@ -718,7 +719,7 @@ def dump(self, filename=None, dbname=None, username=None):`
`718`	`719`	`"""`
`719`	`720`
`720`	`721`	`deftmpfile():`
`721`		`-fd,fname=tempfile.mkstemp(prefix=TMP_DUMP)`
	`722`	`+fd,fname=mkstemp(prefix=TMP_DUMP,dir=testgres_config.temp_dir)`
`722`	`723`	`os.close(fd)`
`723`	`724`	`returnfname`
`724`	`725`

Comments

(0)