resources: pve: avoid relying on internal configuration details

[pve-ha-manager.git] / src / PVE / HA / Resources / PVEVM.pm

diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm
index cb03d237aa411e5160c1b1e00020dde43d4c91dd..1543a2dd29023e32bac40843660646636aa4619f 100644 (file)
--- a/src/PVE/HA/Resources/PVEVM.pm
+++ b/src/PVE/HA/Resources/PVEVM.pm
@@ -3,10 +3,22 @@ package PVE::HA::Resources::PVEVM;
 use strict;
 use warnings;
 
+use PVE::Cluster;
+
 use PVE::HA::Tools;
 
-use PVE::QemuServer;
-use PVE::API2::Qemu;
+BEGIN {
+    if (!$ENV{PVE_GENERATING_DOCS}) {
+       require PVE::QemuConfig;
+       import  PVE::QemuConfig;
+       require PVE::QemuServer;
+       import  PVE::QemuServer;
+       require PVE::QemuServer::Monitor;
+       import  PVE::QemuServer::Monitor;
+       require PVE::API2::Qemu;
+       import  PVE::API2::Qemu;
+    }
+}
 
 use base qw(PVE::HA::Resources);
 
@@ -33,7 +45,7 @@ sub options {
 sub config_file {
     my ($class, $vmid, $nodename) = @_;
 
-    return PVE::QemuServer::config_file($vmid, $nodename);
+    return PVE::QemuConfig->config_file($vmid, $nodename);
 }
 
 sub exists {
@@ -42,7 +54,7 @@ sub exists {
     my $vmlist = PVE::Cluster::get_vmlist();
 
     if(!defined($vmlist->{ids}->{$vmid})) {
-       die "resource 'vm:$vmid' does not exists in cluster\n" if !$noerr;
+       die "resource 'vm:$vmid' does not exist in cluster\n" if !$noerr;
        return undef;
     } else {
        return 1;
@@ -64,23 +76,28 @@ sub start {
 }
 
 sub shutdown {
-    my ($class, $haenv, $id) = @_;
+    my ($class, $haenv, $id, $timeout) = @_;
 
     my $nodename = $haenv->nodename();
-    my $shutdown_timeout = 60; # fixme: make this configurable
+    my $shutdown_timeout = $timeout // 60;
 
+    my $upid;
     my $params = {
        node => $nodename,
        vmid => $id,
-       timeout => $shutdown_timeout,
-       forceStop => 1,
     };
 
-    my $upid = PVE::API2::Qemu->vm_shutdown($params);
+    if ($shutdown_timeout) {
+       $params->{timeout} = $shutdown_timeout;
+       $params->{forceStop} = 1;
+       $upid = PVE::API2::Qemu->vm_shutdown($params);
+    } else {
+       $upid = PVE::API2::Qemu->vm_stop($params);
+    }
+
     PVE::HA::Tools::upid_wait($upid, $haenv);
 }
 
-
 sub migrate {
     my ($class, $haenv, $id, $target, $online) = @_;
 
@@ -89,6 +106,11 @@ sub migrate {
     my $params = {
        node => $nodename,
        vmid => $id,
+       # bug #2241 forces is for local resource only, people can ensure that
+       # different host have the same hardware, so this can be fine, and qemu
+       # knows when not, so can only win here
+       force => 1,
+       'with-local-disks' => 1,
        target => $target,
        online => $online,
     };
@@ -112,7 +134,56 @@ sub check_running {
 
     my $nodename = $haenv->nodename();
 
-    return PVE::QemuServer::check_running($vmid, 1, $nodename);
+    if (PVE::QemuServer::check_running($vmid, 1, $nodename)) {
+       # do not count VMs which are suspended for a backup job as running
+       my $conf = PVE::QemuConfig->load_config($vmid, $nodename);
+       if (defined($conf->{lock}) && $conf->{lock} eq 'backup') {
+           my $qmpstatus = eval {
+               PVE::QemuServer::Monitor::mon_cmd($vmid, 'query-status')
+           };
+           warn "$@\n" if $@;
+
+           return 0 if defined($qmpstatus) && $qmpstatus->{status} eq 'prelaunch';
+       }
+
+       return 1;
+    } else {
+       return 0;
+    }
+}
+
+sub remove_locks {
+    my ($self, $haenv, $id, $locks, $service_node) = @_;
+
+    $service_node = $service_node || $haenv->nodename();
+
+    my $conf = PVE::QemuConfig->load_config($id, $service_node);
+
+    return undef if !defined($conf->{lock});
+
+    foreach my $lock (@$locks) {
+       if ($conf->{lock} eq $lock) {
+           delete $conf->{lock};
+
+           my $cfspath = PVE::QemuConfig->cfs_config_path($id, $service_node);
+           PVE::Cluster::cfs_write_file($cfspath, $conf);
+
+           return $lock;
+       }
+    }
+
+    return undef;
+}
+
+sub get_static_stats {
+    my ($class, $haenv, $id, $service_node) = @_;
+
+    my $conf = PVE::QemuConfig->load_config($id, $service_node);
+
+    return {
+       maxcpu => PVE::QemuConfig->get_derived_property($conf, 'max-cpu'),
+       maxmem => PVE::QemuConfig->get_derived_property($conf, 'max-memory'),
+    };
 }
 
 1;