bugfix: add additional cmdline check (reported by Roman Zharkov)

Author: kulaginm

src/pg_probackup.c

@@ -451,7 +451,7 @@ main(int argc, char *argv[])
 							catalogState->catalog_path, WAL_SUBDIR);
 	}
 
-	/* backup_path is required for all pg_probackup commands except help, version and checkdb */
+	/* backup_path is required for all pg_probackup commands except help, version, checkdb and catchup */
 	if (backup_path == NULL &&
 		backup_subcmd != CHECKDB_CMD &&
 		backup_subcmd != HELP_CMD &&
@@ -598,6 +598,13 @@ main(int argc, char *argv[])
 			"You must specify --log-directory option when running checkdb with "
 			"--log-level-file option enabled.");
 
+	if (backup_subcmd == CATCHUP_CMD &&
+		instance_config.logger.log_level_file != LOG_OFF &&
+		instance_config.logger.log_directory == NULL)
+		elog(ERROR, "Cannot save catchup logs to a file. "
+			"You must specify --log-directory option when running catchup with "
+			"--log-level-file option enabled.");
+
 	/* Initialize logger */
 	init_logger(backup_path, &instance_config.logger);
 

tests/catchup.py

@@ -1,4 +1,3 @@
-import io
 import os
 import unittest
 from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
@@ -381,8 +380,6 @@ def test_tablefile_truncation(self):
             source_pgdata = source_pg.data_dir,
             destination_node = dest_pg,
             options = ['-d', 'postgres', '-p', str(source_pg.port), '--stream'])
-        with io.open(os.path.join(dest_pg.logs_dir, 'catchup.log'), 'a') as catchup_log:
-                catchup_log.write(self.output)
 
         source_pgdata = self.pgdata_content(source_pg.data_dir)
         dest_pgdata = self.pgdata_content(dest_pg.data_dir)

tests/helpers/ptrack_helpers.py

@@ -1053,7 +1053,10 @@ def catchup_node(
         if self.remote:
             cmd_list += ['--remote-proto=ssh', '--remote-host=localhost']
         if self.verbose:
-            cmd_list += ['--log-level-console=verbose']
+            cmd_list += [
+                '--log-level-file=VERBOSE',
+                '--log-directory={0}'.format(destination_node.logs_dir)
+            ]
 
         return self.run_pb(cmd_list + options)