[PBCKP-304] extended testgres.PosgresNode to filter excessive close() and its log entries calls

Author: Ivan Lazarev

tests/helpers/ptrack_helpers.py

@@ -139,41 +139,39 @@ def __init__(self, message, cmd):
     def __str__(self):
         return '\n ERROR: {0}\n CMD: {1}'.format(repr(self.message), self.cmd)
 
-if not hasattr(testgres.PostgresNode, "slow_start"):
-    # Monkey-Patch testgres.PostgresNode - add slow_start method
-    def slow_start(self, replica=False):
 
-        # wait for https://github.com/postgrespro/testgres/pull/50
-    #    self.start()
-    #    self.poll_query_until(
-    #       "postgres",
-    #       "SELECT not pg_is_in_recovery()",
-    #       suppress={testgres.NodeConnection})
-        if replica:
-            query = 'SELECT pg_is_in_recovery()'
-        else:
-            query = 'SELECT not pg_is_in_recovery()'
+def _slow_start(self, replica=False):
+
+    # wait for https://github.com/postgrespro/testgres/pull/50
+#    self.start()
+#    self.poll_query_until(
+#       "postgres",
+#       "SELECT not pg_is_in_recovery()",
+#       suppress={testgres.NodeConnection})
+    if replica:
+        query = 'SELECT pg_is_in_recovery()'
+    else:
+        query = 'SELECT not pg_is_in_recovery()'
+
+    self.start()
+    while True:
+        try:
+            output = self.safe_psql('template1', query).decode("utf-8").rstrip()
 
-        self.start()
-        while True:
-            try:
-                output = self.safe_psql('template1', query).decode("utf-8").rstrip()
-
-                if output == 't':
-                    break
-
-            except testgres.QueryException as e:
-                if 'database system is starting up' in e.message:
-                    pass
-                elif 'FATAL:  the database system is not accepting connections' in e.message:
-                    pass
-                elif replica and 'Hot standby mode is disabled' in e.message:
-                    raise e
-                else:
-                    raise e
+            if output == 't':
+                break
+
+        except testgres.QueryException as e:
+            if 'database system is starting up' in e.message:
+                pass
+            elif 'FATAL:  the database system is not accepting connections' in e.message:
+                pass
+            elif replica and 'Hot standby mode is disabled' in e.message:
+                raise e
+            else:
+                raise e
 
-            sleep(0.5)
-    testgres.PostgresNode.slow_start = slow_start
+        sleep(0.5)
 
 
 def is_test_result_ok(test_case):
@@ -199,6 +197,29 @@ def is_test_result_ok(test_case):
     return ok
 
 
+class PostgresNodeExtended(testgres.PostgresNode):
+
+    def __init__(self, base_dir, *args, **kwargs):
+        super(PostgresNodeExtended, self).__init__(name='test', base_dir=base_dir, *args, **kwargs)
+        self.should_rm_dirs = True
+        self.is_started = False
+
+    def slow_start(self, replica=False):
+        _slow_start(self, replica=replica)
+
+    def start(self, *args, **kwargs):
+        if not self.is_started:
+            super(PostgresNodeExtended, self).start(*args, **kwargs)
+            self.is_started = True
+        return self
+
+    def stop(self, *args, **kwargs):
+        if self.is_started:
+            result = super(PostgresNodeExtended, self).stop(*args, **kwargs)
+            self.is_started = False
+            return result
+
+
 class ProbackupTest(object):
     # Class attributes
     enterprise = is_enterprise()
@@ -420,8 +441,10 @@ def make_empty_node(
         shutil.rmtree(real_base_dir, ignore_errors=True)
         os.makedirs(real_base_dir)
 
-        node = testgres.get_new_node('test', base_dir=real_base_dir)
-        node.should_rm_dirs = True
+        node = PostgresNodeExtended(base_dir=real_base_dir)
+
+        self.nodes_to_cleanup.append(node)
+
         return node
 
     def make_simple_node(
@@ -485,8 +508,6 @@ def make_simple_node(
             self.set_auto_conf(
                 node, {}, 'postgresql.conf', ['wal_keep_segments'])
 
-        self.nodes_to_cleanup.append(node)
-
         return node
 
     def simple_bootstrap(self, node, role) -> None: