Skip to content

Commit e72feb6

Browse files
authored
rapid agent close + disable ssh control master. (#493)
1 parent 8bb0a61 commit e72feb6

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/utils/file.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,10 @@ fio_disconnect(void)
489489
Assert(hdr.cop == FIO_DISCONNECTED);
490490
SYS_CHECK(close(fio_stdin));
491491
SYS_CHECK(close(fio_stdout));
492+
SYS_CHECK(close(fio_stderr));
492493
fio_stdin = 0;
493494
fio_stdout = 0;
495+
fio_stderr = 0;
494496
wait_ssh();
495497
}
496498
}
@@ -3403,7 +3405,8 @@ fio_communicate(int in, int out)
34033405
case FIO_DISCONNECT:
34043406
hdr.cop = FIO_DISCONNECTED;
34053407
IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));
3406-
break;
3408+
free(buf);
3409+
return;
34073410
case FIO_GET_ASYNC_ERROR:
34083411
fio_get_async_error_impl(out);
34093412
break;

src/utils/remote.c

+3
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ bool launch_agent(void)
147147
ssh_argv[ssh_argc++] = "-o";
148148
ssh_argv[ssh_argc++] = "Compression=no";
149149

150+
ssh_argv[ssh_argc++] = "-o";
151+
ssh_argv[ssh_argc++] = "ControlMaster=no";
152+
150153
ssh_argv[ssh_argc++] = "-o";
151154
ssh_argv[ssh_argc++] = "LogLevel=error";
152155

0 commit comments

Comments
 (0)