Merge branch 'master' into unique_system_ids_for_cached_initdb

Author: funbringer

testgres/backup.py

@@ -8,6 +8,8 @@
 
 from .consts import \
     DATA_DIR, \
+    TMP_NODE, \
+    TMP_BACKUP, \
     PG_CONF_FILE, \
     BACKUP_LOG_FILE, \
     DEFAULT_XLOG_METHOD
@@ -49,7 +51,7 @@ def __init__(self,
 
         # Set default arguments
         username = username or default_username()
-        base_dir = base_dir or tempfile.mkdtemp()
+        base_dir = base_dir or tempfile.mkdtemp(prefix=TMP_BACKUP)
 
         # public
         self.original_node = node
@@ -96,7 +98,7 @@ def _prepare_dir(self, destroy):
         available = not destroy
 
         if available:
-            dest_base_dir = tempfile.mkdtemp()
+            dest_base_dir = tempfile.mkdtemp(prefix=TMP_NODE)
 
             data1 = os.path.join(self.base_dir, DATA_DIR)
             data2 = os.path.join(dest_base_dir, DATA_DIR)

testgres/config.py

@@ -7,6 +7,8 @@
 
 from contextlib import contextmanager
 
+from .consts import TMP_CACHE
+
 
 class GlobalConfig(object):
     """
@@ -103,6 +105,7 @@ def copy(self):
 config_stack = []
 
 
+@atexit.register
 def rm_cached_initdb_dirs():
     for d in cached_initdb_dirs:
         shutil.rmtree(d, ignore_errors=True)
@@ -163,8 +166,5 @@ def configure_testgres(**options):
     testgres_config.update(options)
 
 
-# NOTE: to be executed at exit()
-atexit.register(rm_cached_initdb_dirs)
-
 # NOTE: assign initial cached dir for initdb
-testgres_config.cached_initdb_dir = tempfile.mkdtemp()
+testgres_config.cached_initdb_dir = tempfile.mkdtemp(prefix=TMP_CACHE)

testgres/consts.py

@@ -4,6 +4,12 @@
 DATA_DIR = "data"
 LOGS_DIR = "logs"
 
+# prefixes for temp dirs
+TMP_NODE = 'tgsn_'
+TMP_DUMP = 'tgsd_'
+TMP_CACHE = 'tgsc_'
+TMP_BACKUP = 'tgsb_'
+
 # path to control file
 XLOG_CONTROL_FILE = "global/pg_control"
 

testgres/node.py

@@ -23,6 +23,8 @@
 from .consts import \
     DATA_DIR, \
     LOGS_DIR, \
+    TMP_NODE, \
+    TMP_DUMP, \
     PG_CONF_FILE, \
     PG_AUTO_CONF_FILE, \
     HBA_CONF_FILE, \
@@ -106,7 +108,9 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         self.free_port()
 
-        got_exception = value is not None
+        # NOTE: ctrl+C does not count!
+        got_exception = type is not None and type != KeyboardInterrupt
+
         c1 = self.cleanup_on_good_exit and not got_exception
         c2 = self.cleanup_on_bad_exit and got_exception
 
@@ -152,8 +156,9 @@ def _try_shutdown(self, max_attempts):
             except ExecUtilException:
                 pass    # one more time
             except Exception:
-                # TODO: probably kill stray instance
+                # TODO: probably should kill stray instance
                 eprint('cannot stop node {}'.format(self.name))
+                break
 
             attempts += 1
 
@@ -195,7 +200,7 @@ def _create_recovery_conf(self, username):
 
     def _prepare_dirs(self):
         if not self.base_dir:
-            self.base_dir = tempfile.mkdtemp()
+            self.base_dir = tempfile.mkdtemp(prefix=TMP_NODE)
 
         if not os.path.exists(self.base_dir):
             os.makedirs(self.base_dir)
@@ -713,7 +718,7 @@ def dump(self, filename=None, dbname=None, username=None):
         """
 
         def tmpfile():
-            fd, fname = tempfile.mkstemp()
+            fd, fname = tempfile.mkstemp(prefix=TMP_DUMP)
             os.close(fd)
             return fname