proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-30 18:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrate: refactor mtunnel read/write

Browse Source 
to make adding new commands and reading replies easier

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-08-04 14:53:59 +02:00 committed by Wolfgang Bumiller
parent d7b1b24b6f
commit e0eb1f7677
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
PVE/QemuMigrate.pm
View File

@ -91,6 +91,40 @@ sub finish_command_pipe {
if !&$collect_child_process(); if !&$collect_child_process();
} }
sub read_tunnel {
my ($self, $tunnel, $timeout) = @_;
$timeout = 60 if !defined($timeout);
my $reader = $tunnel->{reader};
my $output;
eval {
PVE::Tools::run_with_timeout($timeout, sub { $output = <$reader>; });
};
die "reading from tunnel failed: $@\n" if $@;
chomp $output;
return $output;
}
sub write_tunnel {
my ($self, $tunnel, $timeout, $command) = @_;
$timeout = 60 if !defined($timeout);
my $writer = $tunnel->{writer};
eval {
PVE::Tools::run_with_timeout($timeout, sub {
print $writer "$command\n";
$writer->flush();
});
};
die "writing to tunnel failed: $@\n" if $@;
}
sub fork_tunnel { sub fork_tunnel {
my ($self, $tunnel_addr) = @_; my ($self, $tunnel_addr) = @_;
@ -100,11 +134,8 @@ sub fork_tunnel {
my $tunnel = $self->fork_command_pipe($cmd); my $tunnel = $self->fork_command_pipe($cmd);
my $reader = $tunnel->{reader};
my $helo;
eval { eval {
PVE::Tools::run_with_timeout(60, sub { $helo = <$reader>; }); my $helo = $self->read_tunnel($tunnel, 60);
die "no reply\n" if !$helo; die "no reply\n" if !$helo;
die "no quorum on target node\n" if $helo =~ m/^no quorum$/; die "no quorum on target node\n" if $helo =~ m/^no quorum$/;
die "got strange reply from mtunnel ('$helo')\n" die "got strange reply from mtunnel ('$helo')\n"
@ -122,14 +153,7 @@ sub fork_tunnel {
sub finish_tunnel { sub finish_tunnel {
my ($self, $tunnel) = @_; my ($self, $tunnel) = @_;
my $writer = $tunnel->{writer}; eval { $self->write_tunnel($tunnel, 30, 'quit'); };
eval {
PVE::Tools::run_with_timeout(30, sub {
print $writer "quit\n";
$writer->flush();
});
};
my $err = $@; my $err = $@;
$self->finish_command_pipe($tunnel, 30); $self->finish_command_pipe($tunnel, 30);