my $execute = $cmd->{execute} || die "no command name specified";
my $qga = ($execute =~ /^guest\-+/) ? 1 : 0;
-
+
my $sname = PVE::QemuServer::qmp_socket($vmid, $qga);
- $self->{queue_info}->{$sname} = { qga => $qga, vmid => $vmid, sname => $sname, cmds => [] }
+ $self->{queue_info}->{$sname} = { qga => $qga, vmid => $vmid, sname => $sname, cmds => [] }
if !$self->{queue_info}->{$sname};
push @{$self->{queue_info}->{$sname}->{cmds}}, $cmd;
my $callback = sub {
my ($vmid, $resp) = @_;
$result = $resp->{'return'};
+ $result = { error => $resp->{'error'} } if !defined($result) && $resp->{'error'};
};
die "no command specified" if !($cmd && $cmd->{execute});
$timeout = 60*60; # 1 hour
} elsif ($cmd->{execute} =~ m/^(eject|change)/) {
$timeout = 60; # note: cdrom mount command is slow
+ } elsif ($cmd->{execute} eq 'guest-fsfreeze-freeze') {
+ # freeze syncs all guest FS, if we kill it it stays in an unfreezable
+ # locked state with high probability, so use an generous timeout
+ $timeout = 60*60; # 1 hour
+ } elsif ($cmd->{execute} eq 'guest-fsfreeze-thaw') {
+ # thaw has no possible long blocking actions, either it returns
+ # instantly or never (dead locked)
+ $timeout = 10;
} elsif ($cmd->{execute} eq 'savevm-start' ||
$cmd->{execute} eq 'savevm-end' ||
$cmd->{execute} eq 'query-backup' ||
$cmd->{execute} eq 'query-block-jobs' ||
+ $cmd->{execute} eq 'block-job-cancel' ||
+ $cmd->{execute} eq 'block-job-complete' ||
$cmd->{execute} eq 'backup-cancel' ||
$cmd->{execute} eq 'query-savevm' ||
- $cmd->{execute} eq 'delete-drive-snapshot' ||
+ $cmd->{execute} eq 'delete-drive-snapshot' ||
$cmd->{execute} eq 'guest-shutdown' ||
+ $cmd->{execute} eq 'blockdev-snapshot-internal-sync' ||
+ $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' ||
$cmd->{execute} eq 'snapshot-drive' ) {
$timeout = 10*60; # 10 mins ?
} else {
my $lookup_queue_info = sub {
my ($self, $fh, $noerr) = @_;
- my $queue_info = $self->{queue_lookup}->{$fh};
+ my $queue_info = $self->{queue_lookup}->{$fh};
if (!$queue_info) {
warn "internal error - unable to lookup queue info" if !$noerr;
return undef;
if (my $fh = delete $queue_info->{fh}) {
delete $self->{queue_lookup}->{$fh};
$self->{mux}->close($fh);
- }
+ }
};
my $open_connection = sub {
if ($qga) {
- $qmpcmd = to_json({ execute => 'guest-sync', arguments => { id => int($cmd->{id})}}) .
+ $qmpcmd = to_json({ execute => 'guest-sync-delimited',
+ arguments => { id => int($cmd->{id})}}) .
to_json({ execute => $cmd->{execute}, arguments => $cmd->{arguments}});
} else {
foreach my $sname (keys %{$self->{queue_info}}) {
my $queue_info = $self->{queue_info}->{$sname};
next if !scalar(@{$queue_info->{cmds}}); # no commands
-
+
$queue_info->{error} = undef;
$queue_info->{current} = undef;
- eval {
+ eval {
&$open_connection($self, $queue_info, $timeout);
if (!$queue_info->{qga}) {
sub mux_close {
my ($self, $mux, $fh) = @_;
- my $queue_info = &$lookup_queue_info($self, $fh, 1);
+ my $queue_info = &$lookup_queue_info($self, $fh, 1);
return if !$queue_info;
- $queue_info->{error} = "client closed connection\n"
+ $queue_info->{error} = "client closed connection\n"
if !$queue_info->{error};
}
sub mux_input {
my ($self, $mux, $fh, $input) = @_;
- my $queue_info = &$lookup_queue_info($self, $fh);
+ my $queue_info = &$lookup_queue_info($self, $fh);
return if !$queue_info;
- my $sname = $queue_info->{sname};
- my $vmid = $queue_info->{vmid};
+ my $sname = $queue_info->{sname};
+ my $vmid = $queue_info->{vmid};
my $qga = $queue_info->{qga};
my $curcmd = $queue_info->{current};
die "unable to lookup current command for VM $vmid ($sname)\n" if !$curcmd;
-
+
my $raw;
if ($qga) {
- return if $$input !~ s/^([^\n]+}\r?\n[^\n]+})\r?\n(.*)$/$2/so;
+ return if $$input !~ s/^.*\xff([^\n]+}\r?\n[^\n]+})\r?\n(.*)$/$2/so;
$raw = $1;
} else {
return if $$input !~ s/^(.*})\r?\n(.*)$/$2/so;
my $cmdid = $obj->{'return'};
die "received responsed without command id\n" if !$cmdid;
-
+
+ # skip results fro previous commands
+ return if $cmdid < $curcmd->{id};
+
if ($curcmd->{id} ne $cmdid) {
die "got wrong command id '$cmdid' (expected $curcmd->{id})\n";
}
sub mux_timeout {
my ($self, $mux, $fh) = @_;
- if (my $queue_info = &$lookup_queue_info($self, $fh)) {
+ if (my $queue_info = &$lookup_queue_info($self, $fh)) {
$queue_info->{error} = "got timeout\n";
$self->{mux}->inbuffer($fh, ''); # clear to avoid warnings
}
my $queue_info = &$lookup_queue_info($self, $fh);
return if !$queue_info;
- my $sname = $queue_info->{sname};
- my $vmid = $queue_info->{vmid};
+ my $sname = $queue_info->{sname};
+ my $vmid = $queue_info->{vmid};
my $qga = $queue_info->{qga};
-
+
my $curcmd = $queue_info->{current};
die "unable to lookup current command for VM $vmid ($sname)\n" if !$curcmd;
if ($qga && $qga_allow_close_cmds->{$curcmd->{execute}}) {
- return if $$input !~ s/^([^\n]+})\r?\n(.*)$/$2/so;
+ return if $$input !~ s/^.*\xff([^\n]+})\r?\n(.*)$/$2/so;
my $raw = $1;