lvmthin: activate base volumes

[pve-storage.git] / PVE / Storage / LvmThinPlugin.pm

diff --git a/PVE/Storage/LvmThinPlugin.pm b/PVE/Storage/LvmThinPlugin.pm
index 91f608927704ce4dbd8c58d5758b37597244a589..c834a2272f98a903f0748d90e256a5d93e152a93 100644 (file)
--- a/PVE/Storage/LvmThinPlugin.pm
+++ b/PVE/Storage/LvmThinPlugin.pm
@@ -163,6 +163,20 @@ sub list_images {
     return $res;
 }
 
+sub list_thinpools {
+    my ($vg) = @_;
+
+    my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg);
+    my $thinpools = [];
+
+    foreach my $lvname (keys %{$lvs->{$vg}}) {
+       next if $lvs->{$vg}->{$lvname}->{lv_type} ne 't';
+       push @$thinpools, { lv => $lvname };
+    }
+
+    return $thinpools;
+}
+
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
@@ -195,6 +209,9 @@ sub activate_volume {
        my $snapvol = "snap_${volname}_$snapname";
        my $cmd = ['/sbin/lvchange', '-ay', '-K', "$vg/$snapvol"];
        run_command($cmd, errmsg => "activate_volume '$vg/$snapvol' error");
+    } elsif ($volname =~ /^base-/) {
+       my $cmd = ['/sbin/lvchange', '-ay', '-K', "$vg/$volname"];
+       run_command($cmd, errmsg => "activate_volume '$vg/$volname' error");
     } else {
        # other volumes are active by default
     }
@@ -210,6 +227,9 @@ sub deactivate_volume {
        my $snapvol = "snap_${volname}_$snapname";
        my $cmd = ['/sbin/lvchange', '-an', "$vg/$snapvol"];
        run_command($cmd, errmsg => "deactivate_volume '$vg/$snapvol' error");
+    } elsif ($volname =~ /^base-/) {
+       my $cmd = ['/sbin/lvchange', '-an', "$vg/$volname"];
+       run_command($cmd, errmsg => "deactivate_volume '$vg/$volname' error");
     } else {
        # other volumes are kept active
     }
@@ -218,20 +238,27 @@ sub deactivate_volume {
 sub clone_image {
     my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
 
-    die "clone_image from snapshots not implemented" if $snap;
+    my $vg = $scfg->{vgname};
 
-    my ($vtype, undef, undef, undef, undef, $isBase, $format) =
-        $class->parse_volname($volname);
+    my $lv;
 
-    die "clone_image only works on base images\n" if !$isBase;
+    if ($snap) {
+       $lv = "$vg/snap_${volname}_$snap";
+    } else {
+       my ($vtype, undef, undef, undef, undef, $isBase, $format) =
+           $class->parse_volname($volname);
+
+       die "clone_image only works on base images\n" if !$isBase;
+
+       $lv = "$vg/$volname";
+    }
 
-    my $vg = $scfg->{vgname};
     my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg);
 
     my $name =  PVE::Storage::LVMPlugin::lvm_find_free_diskname($lvs, $vg, $storeid, $vmid);
 
-    my $cmd = ['/sbin/lvcreate', '-n', $name, '-prw', '-kn', '-s', "$vg/$volname"];
-    run_command($cmd, errmsg => "clone image '$vg/$volname' error");
+    my $cmd = ['/sbin/lvcreate', '-n', $name, '-prw', '-kn', '-s', $lv];
+    run_command($cmd, errmsg => "clone image '$lv' error");
 
     return $name;
 }
@@ -312,9 +339,10 @@ sub volume_has_feature {
 
     my $features = {
        snapshot => { current => 1 },
-       clone => { base => 1},
+       clone => { base => 1, snap => 1},
        template => { current => 1},
-       copy => { base => 1, current => 1},
+       copy => { base => 1, current => 1, snap => 1},
+       sparseinit => { base => 1, current => 1},
     };
 
     my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =