Merge branch 'master' into fix_ptrack_1230

Author: alubennikova

src/data.c

@@ -800,7 +800,7 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
 		if (!overwrite && fileExists(gz_to_path))
 			elog(ERROR, "WAL segment \"%s\" already exists.", gz_to_path);
 
-		snprintf(to_path_temp, sizeof(to_path_temp), "%s.temp", gz_to_path);
+		snprintf(to_path_temp, sizeof(to_path_temp), "%s.partial", gz_to_path);
 
 		gz_out = gzopen(to_path_temp, "wb");
 		if (gzsetparams(gz_out, compress_level, Z_DEFAULT_STRATEGY) != Z_OK)
@@ -815,7 +815,7 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
 		if (!overwrite && fileExists(to_path))
 			elog(ERROR, "WAL segment \"%s\" already exists.", to_path);
 
-		snprintf(to_path_temp, sizeof(to_path_temp), "%s.temp", to_path);
+		snprintf(to_path_temp, sizeof(to_path_temp), "%s.partial", to_path);
 
 		out = fopen(to_path_temp, "w");
 		if (out == NULL)
@@ -974,7 +974,7 @@ get_wal_file(const char *from_path, const char *to_path)
 	}
 
 	/* open backup file for write  */
-	snprintf(to_path_temp, sizeof(to_path_temp), "%s.temp", to_path);
+	snprintf(to_path_temp, sizeof(to_path_temp), "%s.partial", to_path);
 
 	out = fopen(to_path_temp, "w");
 	if (out == NULL)

tests/Readme.md

@@ -6,14 +6,15 @@ Note: For now there are tests only for Linix
 
 
 ```
-Check physical correctness of restored instances.
-Apply this patch to disable HINT BITS: https://gist.github.com/gsmol/2bb34fd3ba31984369a72cc1c27a36b6
-export PG_PROBACKUP_PARANOIA=ON
+Check physical correctness of restored instances:
+ Apply this patch to disable HINT BITS: https://gist.github.com/gsmol/2bb34fd3ba31984369a72cc1c27a36b6
+ export PG_PROBACKUP_PARANOIA=ON
 
 Check archive compression:
-export ARCHIVE_COMPRESSION=ON
+ export ARCHIVE_COMPRESSION=ON
 
-export PG_CONFIG=/path/to/pg_config
-pip install testgres=0.4.0
-python -m unittest [-v] tests
+Usage:
+ pip install testgres=0.4.0
+ export PG_CONFIG=/path/to/pg_config
+ python -m unittest [-v] tests[.specific_module][.class.test]
 ```

tests/helpers/ptrack_helpers.py

@@ -451,7 +451,7 @@ def run_pb(self, command, async=False, gdb=False):
             if self.verbose:
                 print(self.cmd)
             if gdb:
-                return GDBobj([self.probackup_path] + command, verbose=True)
+                return GDBobj([self.probackup_path] + command, self.verbose)
             if async:
                 return subprocess.Popen(
                     self.cmd,
@@ -913,13 +913,30 @@ def __str__(self):
 
 class GDBobj(ProbackupTest):
     def __init__(self, cmd, verbose):
+        self.verbose = verbose
+
+        # Check gdb presense
+        try:
+            gdb_version, _ = subprocess.Popen(
+                ["gdb", "--version"],
+                stdout=subprocess.PIPE
+            ).communicate()
+        except OSError:
+            raise GdbException("Couldn't find gdb on the path")
+
         self.base_cmd = [
-            '/usr/bin/gdb',
+            'gdb',
             '--interpreter',
             'mi2',
             '--args'
             ] + cmd
-        self.verbose = verbose
+
+        # Get version
+        gdb_version_number = re.search(
+            b"^GNU gdb [^\d]*(\d+)\.(\d)",
+            gdb_version)
+        self.major_version = int(gdb_version_number.group(1))
+        self.minor_version = int(gdb_version_number.group(2))
         if self.verbose:
             print([' '.join(map(str, self.base_cmd))])
 
@@ -929,10 +946,11 @@ def __init__(self, cmd, verbose):
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             bufsize=0, universal_newlines=True
-            )
+        )
         self.gdb_pid = self.proc.pid
 
-        # discard stuff
+        # discard data from pipe,
+        # is there a way to do it a less derpy way?
         while True:
             line = self.proc.stdout.readline()
             if not line.startswith('(gdb)'):
@@ -943,52 +961,49 @@ def __init__(self, cmd, verbose):
     def set_breakpoint(self, location):
         result = self._execute('break ' + location)
         success = False
-        for line in result.splitlines():
-            # Success
+        for line in result:
             if line.startswith('~"Breakpoint'):
                 success = True
                 break
             if line.startswith('^error') or line.startswith('(gdb)'):
                 break
-            # discard initial data from pipe,
-            # is there a way to do it a less derpy way?
-            if line.startswith('&'):
-                if line.startswith('&"break'):
-                    pass
-                if line.startswith('&"Function'):
-                    GdbBreakpointException = GdbException()
-                    raise GdbBreakpointException(line)
-                if line.startswith('&"No line'):
-                    GdbBreakpointException = GdbException()
-                    raise GdbBreakpointException(line)
+
+            if line.startswith('&"break'):
+                pass
+
+            if line.startswith('&"Function'):
+                raise GdbException(line)
+
+            if line.startswith('&"No line'):
+                raise GdbException(line)
         return success
 
     def run(self):
         result = self._execute('run')
-        for line in result.splitlines():
+        for line in result:
             if line.startswith('*stopped,reason="breakpoint-hit"'):
                 return 'breakpoint-hit'
             if line.startswith('*stopped,reason="exited-normally"'):
                 return 'exit correct'
 
     def continue_execution(self, sync=True):
         result = self._execute('continue')
-        for line in result.splitlines():
+        for line in result:
             if line.startswith('*stopped,reason="breakpoint-hit"'):
                 return 'breakpoint-hit'
             if line.startswith('*stopped,reason="exited-normally"'):
                 return 'exit correct'
 
     # use for breakpoint, run, continue
     def _execute(self, cmd):
-        output = ''
+        output = []
         self.proc.stdin.flush()
         self.proc.stdin.write(cmd + '\n')
         self.proc.stdin.flush()
 
         while True:
             line = self.proc.stdout.readline()
-            output = output + line
+            output += [line]
             if self.verbose:
                 print(line)
             if line == '^done\n' or line.startswith('*stopped'):