Wait for ssh process completion in fio_disconnect

knizhnik · knizhnik · commit d57b65fa87b0 · 2019-07-02T16:49:38.000+03:00
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -577,6 +577,7 @@ extern bool in_backup_list(parray *backup_list, pgBackup *target_backup);
 extern int get_backup_index_number(parray *backup_list, pgBackup *backup);
 extern bool launch_agent(void);
 extern void launch_ssh(char* argv[]);
+extern void wait_ssh(void);
 
 #define COMPRESS_ALG_DEFAULT NOT_DEFINED_COMPRESS
 #define COMPRESS_LEVEL_DEFAULT 1
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -344,6 +344,7 @@ fio_disconnect(void)
 		SYS_CHECK(close(fio_stdout));
 		fio_stdin = 0;
 		fio_stdout = 0;
+		wait_ssh();
 	}
 }
 
diff --git a/src/utils/remote.c b/src/utils/remote.c
@@ -53,13 +53,22 @@ static int split_options(int argc, char* argv[], int max_options, char* options)
 }
 
 static int child_pid;
+
 #if 0
 static void kill_child(void)
 {
 	kill(child_pid, SIGTERM);
 }
 #endif
 
+
+void wait_ssh(void)
+{
+	int status;
+	waitpid(child_pid, &status, 0);
+	elog(LOG, "SSH process %d is terminated with status %d",  child_pid, status);
+}
+
 #ifdef WIN32
 void launch_ssh(char* argv[])
 {

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,22 @@ static int split_options(int argc, char* argv[], int max_options, char* options)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`static int child_pid;`
	`56`	`+`
`56`	`57`	`#if 0`
`57`	`58`	`static void kill_child(void)`
`58`	`59`	`{`
`59`	`60`	`kill(child_pid, SIGTERM);`
`60`	`61`	`}`
`61`	`62`	`#endif`
`62`	`63`
	`64`	`+`
	`65`	`+void wait_ssh(void)`
	`66`	`+{`
	`67`	`+ int status;`
	`68`	`+ waitpid(child_pid, &status, 0);`
	`69`	`+ elog(LOG, "SSH process %d is terminated with status %d", child_pid, status);`
	`70`	`+}`
	`71`	`+`
`63`	`72`	`#ifdef WIN32`
`64`	`73`	`void launch_ssh(char* argv[])`
`65`	`74`	`{`