Skip to content

Commit 4ee8592

Browse files
committed
rapid agent close + disable ssh control master.
1 parent 43a92b7 commit 4ee8592

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/utils/file.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,10 @@ fio_disconnect(void)
492492
Assert(hdr.cop == FIO_DISCONNECTED);
493493
SYS_CHECK(close(fio_stdin));
494494
SYS_CHECK(close(fio_stdout));
495+
SYS_CHECK(close(fio_stderr));
495496
fio_stdin = 0;
496497
fio_stdout = 0;
498+
fio_stderr = 0;
497499
wait_ssh();
498500
}
499501
}
@@ -3505,7 +3507,8 @@ fio_communicate(int in, int out)
35053507
case FIO_DISCONNECT:
35063508
hdr.cop = FIO_DISCONNECTED;
35073509
IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));
3508-
break;
3510+
free(buf);
3511+
return;
35093512
case FIO_GET_ASYNC_ERROR:
35103513
fio_get_async_error_impl(out);
35113514
break;

src/utils/remote.c

Lines changed: 3 additions & 0 deletions
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)