yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage_migrate: also log with an insecure connection if there is a log function

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2020-01-29 14:30:02 +01:00
committed by Fabian Grünbichler
parent 94dd8b0cfa
commit aca83310dd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Storage.pm
View File

@ -626,11 +626,21 @@ sub storage_migrate {
or die "failed to connect to tunnel at $ip:$port\n"; or die "failed to connect to tunnel at $ip:$port\n";
# we won't be reading from the socket # we won't be reading from the socket
shutdown($socket, 0); shutdown($socket, 0);
run_command([$send, @cstream], output => '>&'.fileno($socket)); run_command([$send, @cstream], output => '>&'.fileno($socket), logfunc => $logfunc);
# don't close the connection entirely otherwise the receiving end # don't close the connection entirely otherwise the receiving end
# might not get all buffered data (and fails with 'connection reset by peer') # might not get all buffered data (and fails with 'connection reset by peer')
shutdown($socket, 1); shutdown($socket, 1);
1 while <$info>; # wait for the remote process to finish
# wait for the remote process to finish
if ($logfunc) {
while (my $line = <$info>) {
chomp($line);
$logfunc->("[$target_sshinfo->{name}] $line");
}
} else {
1 while <$info>;
}
# now close the socket # now close the socket
close($socket); close($socket);
if (!close($info)) { # does waitpid() if (!close($info)) { # does waitpid()