LXC: separate freeze_thaw to explicit freeze and thaw methods

as else one needs to always lookup parameter value means freeze and
which one thaw when reading call sites what

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 86a96a902d12e1fa255b51eec34daaabcdc72fdb..f3aca7a2b871a2dacb31a5045835b95acbe35e2d 100644 (file)
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -2376,12 +2376,14 @@ sub get_lxc_version() {
     return $version->@*;
 }
 
-sub freeze_thaw($$) {
-    my ($vmid, $freeze) = @_;
-
-    my $cgroup = PVE::LXC::CGroup->new($vmid);
+sub freeze($) {
+    my ($vmid) = @_;
+    PVE::LXC::CGroup->new($vmid)->freeze_thaw(1);
+}
 
-    $cgroup->freeze_thaw($freeze);
+sub thaw($) {
+    my ($vmid) = @_;
+    PVE::LXC::CGroup->new($vmid)->freeze_thaw(0);
 }
 
 1;

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 51470cfb5c31c1228acad39e9237615caad8a1cf..8d1854a65faaf4305e5e6d440051c73833a20120 100644 (file)
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -103,10 +103,10 @@ sub __snapshot_freeze {
     my ($class, $vmid, $unfreeze) = @_;
 
     if ($unfreeze) {
-       eval { PVE::LXC::freeze_thaw($vmid, 0); };
+       eval { PVE::LXC::thaw($vmid); };
        warn $@ if $@;
     } else {
-       PVE::LXC::freeze_thaw($vmid, 1);
+       PVE::LXC::freeze($vmid);
        PVE::LXC::sync_container_namespace($vmid);
     }
 }

diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index cb745bf5909b31b51892a1dc125263bf420ec2fb..0dc60c4dc5f1beedb0ba609458a87993cfee8526 100644 (file)
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -272,13 +272,13 @@ sub start_vm {
 sub suspend_vm {
     my ($self, $task, $vmid) = @_;
 
-    PVE::LXC::freeze_thaw($vmid, 1);
+    PVE::LXC::freeze($vmid);
 }
 
 sub resume_vm {
     my ($self, $task, $vmid) = @_;
 
-    PVE::LXC::freeze_thaw($vmid, 0);
+    PVE::LXC::thaw($vmid);
 }
 
 sub assemble {

diff --git a/src/test/snapshot-test.pm b/src/test/snapshot-test.pm
index 1194805172615b8f5c9c2bec8489901768a2f82a..bfb8551fcf22ee71f242f23367ea0ad66b718b5d 100644 (file)
--- a/src/test/snapshot-test.pm
+++ b/src/test/snapshot-test.pm
@@ -122,10 +122,10 @@ sub mocked_vm_stop {
     }
 }
 
-sub mocked_freeze_thaw {
-    my ($vmid, $freeze) = @_;
+sub mocked_freeze{
+    my ($vmid) = @_;
     return () if $freeze_possible;
-    die "lxc-[un]freeze disabled\n";
+    die "freeze disabled\n";
 }
 
 sub mocked_run_command {
@@ -282,7 +282,8 @@ my $lxc_module = new Test::MockModule('PVE::LXC');
 $lxc_module->mock('sync_container_namespace', sub { return; });
 $lxc_module->mock('check_running', \&mocked_check_running);
 $lxc_module->mock('vm_stop', \&mocked_vm_stop);
-$lxc_module->mock('freeze_thaw', \&mocked_freeze_thaw);
+$lxc_module->mock('freeze', \&mocked_freeze);
+$lxc_module->mock('thaw', \&mocked_freeze); # re-use, as for now we don't care
 
 my $lxc_config_module = new Test::MockModule('PVE::LXC::Config');
 $lxc_config_module->mock('config_file_lock', sub { return "snapshot-working/pve-test.lock"; });
@@ -412,7 +413,7 @@ testcase_create("201", "test", 0, "test comment", "volume snapshot disabled\n\n"
 
 printf("Expected error for snapshot_create with broken lxc-freeze\n");
 $freeze_possible = 0;
-testcase_create("202", "test", 0, "test comment", "lxc-[un]freeze disabled\n\n");
+testcase_create("202", "test", 0, "test comment", "freeze disabled\n\n");
 $freeze_possible = 1;
 
 printf("Expected error for snapshot_create when mp volume snapshot is not possible\n");