Remove --remote option

knizhnik · knizhnik · commit 66ebfcbd045a · 2019-01-22T20:41:17.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -492,7 +492,7 @@ do_backup_instance(void)
 	current.data_bytes = 0;
 
 	/* Obtain current timeline */
-	if (instance_config.remote.enabled)
+	if (IsReplicationProtocol())
 	{
 		char	   *sysidentifier;
 		TimeLineID	starttli;
@@ -632,7 +632,8 @@ do_backup_instance(void)
 	backup_files_list = parray_new();
 
 	/* list files with the logical path. omit $PGDATA */
-	if (instance_config.remote.enabled)
+
+	if (IsReplicationProtocol())
 		get_remote_pgdata_filelist(backup_files_list);
 	else
 		dir_list_file(backup_files_list, instance_config.pgdata,
@@ -699,7 +700,7 @@ do_backup_instance(void)
 			char	   *dir_name;
 			char		database_path[MAXPGPATH];
 
-			if (!instance_config.remote.enabled)
+			if (!IsReplicationProtocol())
 				dir_name = GetRelativePath(file->path, instance_config.pgdata);
 			else
 				dir_name = file->path;
@@ -749,7 +750,7 @@ do_backup_instance(void)
 
 		elog(VERBOSE, "Start thread num: %i", i);
 
-		if (!instance_config.remote.enabled)
+		if (!IsReplicationProtocol())
 			pthread_create(&threads[i], NULL, backup_files, arg);
 		else
 			pthread_create(&threads[i], NULL, remote_backup_files, arg);
@@ -902,7 +903,7 @@ do_backup(time_t start_time)
 	check_server_version();
 
 	/* TODO fix it for remote backup*/
-	if (!instance_config.remote.enabled)
+	if (!IsReplicationProtocol())
 		current.checksum_version = get_data_checksum_version(true);
 
 	is_checksum_enabled = pg_checksum_enable();
@@ -958,7 +959,7 @@ do_backup(time_t start_time)
 	 * belogns to the same instance.
 	 */
 	/* TODO fix it for remote backup */
-	if (!instance_config.remote.enabled)
+	if (!IsReplicationProtocol())
 		check_system_identifiers();
 
 
diff --git a/src/configure.c b/src/configure.c
@@ -204,11 +204,6 @@ ConfigOption instance_options[] =
 		&instance_config.remote.ssh_config, SOURCE_CMD, 0,
 		OPTION_REMOTE_GROUP, 0, option_get_value
 	},
-	{
-		'b', 225, "remote",
-		&instance_config.remote.enabled, SOURCE_CMD, 0,
-		OPTION_REMOTE_GROUP, 0, option_get_value
-	},
 	{ 0 }
 };
 
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
@@ -333,7 +333,7 @@ main(int argc, char *argv[])
 	if (!is_absolute_path(backup_path))
 		elog(ERROR, "-B, --backup-path must be an absolute path");
 
-	if (IsSshConnection()
+	if (IsSshProtocol()
 		&& (backup_subcmd == BACKUP_CMD || backup_subcmd == ADD_INSTANCE_CMD || backup_subcmd == RESTORE_CMD ||
 			backup_subcmd == ARCHIVE_PUSH_CMD || backup_subcmd == ARCHIVE_GET_CMD))
 	{
@@ -501,7 +501,7 @@ main(int argc, char *argv[])
 			return do_init();
 		case BACKUP_CMD:
 		    current.stream = stream_wal;
-		    if (IsSshConnection() && !remote_agent)
+		    if (IsSshProtocol() && !remote_agent)
 			{
 				current.status = BACKUP_STATUS_DONE;
 				StrNCpy(current.program_version, PROGRAM_VERSION,
@@ -519,7 +519,7 @@ main(int argc, char *argv[])
 
 				elog(INFO, "Backup start, pg_probackup version: %s, backup ID: %s, backup mode: %s, instance: %s, stream: %s, remote %s",
 						  PROGRAM_VERSION, base36enc(start_time), backup_mode, instance_name,
-						  stream_wal ? "true" : "false", instance_config.remote.enabled ? "true" : "false");
+						  stream_wal ? "true" : "false", instance_config.remote.host ? "true" : "false");
 
 				return do_backup(start_time);
 			}
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -348,7 +348,8 @@ typedef struct
 	XLByteInSeg(xlrp, logSegNo)
 #endif
 
-#define IsSshConnection() (instance_config.remote.enabled && strcmp(instance_config.remote.proto, "ssh") == 0)
+#define IsSshProtocol() (instance_config.remote.host && strcmp(instance_config.remote.proto, "ssh") == 0)
+#define IsReplicationProtocol() (instance_config.remote.host && strcmp(instance_config.remote.proto, "replication") == 0)
 
 /* directory options */
 extern char	   *backup_path;
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -49,7 +49,7 @@ static bool fio_is_remote(fio_location location)
 {
 	return location == FIO_REMOTE_HOST
 		|| (location == FIO_BACKUP_HOST && remote_agent) /* agent is launched at Postgres side */
-		|| (location == FIO_DB_HOST && !remote_agent && IsSshConnection());
+		|| (location == FIO_DB_HOST && !remote_agent && IsSshProtocol());
 }
 
 /* Try to read specified amount of bytes unless error or EOF are encountered */
diff --git a/src/utils/remote.h b/src/utils/remote.h
@@ -18,7 +18,6 @@ typedef struct RemoteConfig
 	char* path;
 	char *ssh_config;
 	char *ssh_options;
-	bool  enabled;
 } RemoteConfig;
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static bool fio_is_remote(fio_location location)`
`49`	`49`	`{`
`50`	`50`	`return location == FIO_REMOTE_HOST`
`51`	`51`	`\|\| (location == FIO_BACKUP_HOST && remote_agent) /* agent is launched at Postgres side */`
`52`		`- \|\| (location == FIO_DB_HOST && !remote_agent && IsSshConnection());`
	`52`	`+ \|\| (location == FIO_DB_HOST && !remote_agent && IsSshProtocol());`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/* Try to read specified amount of bytes unless error or EOF are encountered */`