!4917 rapid agent close + disable ssh control master.
Merge pull request !4917 from 吴岳川/probackup
This commit is contained in:
@ -472,8 +472,10 @@ fio_disconnect(void)
|
||||
Assert(hdr.cop == FIO_DISCONNECTED);
|
||||
SYS_CHECK(close(fio_stdin));
|
||||
SYS_CHECK(close(fio_stdout));
|
||||
SYS_CHECK(close(fio_stderr));
|
||||
fio_stdin = 0;
|
||||
fio_stdout = 0;
|
||||
fio_stderr = 0;
|
||||
wait_ssh();
|
||||
}
|
||||
}
|
||||
@ -2454,7 +2456,8 @@ void fio_communicate(int in, int out)
|
||||
case FIO_DISCONNECT:
|
||||
hdr.cop = FIO_DISCONNECTED;
|
||||
IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));
|
||||
break;
|
||||
free(buf);
|
||||
return;
|
||||
default:
|
||||
Assert(false);
|
||||
}
|
||||
|
||||
@ -150,6 +150,9 @@ bool launch_agent(void)
|
||||
ssh_argv[ssh_argc++] = (char *)"-o";
|
||||
ssh_argv[ssh_argc++] = (char *)"Compression=no";
|
||||
|
||||
ssh_argv[ssh_argc++] = (char *)"-o";
|
||||
ssh_argv[ssh_argc++] = (char *)"ControlMaster=no";
|
||||
|
||||
ssh_argv[ssh_argc++] = (char *)"-o";
|
||||
ssh_argv[ssh_argc++] = (char *)"LogLevel=error";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user