X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FLXC%2FConfig.pm;h=e76d55888c097afff8051febb8d47fa4a3b50bda;hb=af21e6993a9efa5d13a8bd65ab990461b47adcb3;hp=933e6ca3e2d20de4dad44015c96a29f6c35998bb;hpb=f59c9670787e4c37a362877c7ebe25810a3f34a7;p=pve-container.git

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 933e6ca..e76d558 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -124,7 +124,9 @@ sub __snapshot_delete_remove_drive {
 	my $value = $snap->{$remove_drive};
 	my $mountpoint = $remove_drive eq 'rootfs' ? $class->parse_ct_rootfs($value, 1) : $class->parse_ct_mountpoint($value, 1);
 	delete $snap->{$remove_drive};
-	$class->add_unused_volume($snap, $mountpoint->{volume});
+
+	$class->add_unused_volume($snap, $mountpoint->{volume})
+	    if ($mountpoint->{type} eq 'volume');
     }
 }
 
@@ -137,6 +139,9 @@ sub __snapshot_delete_vmstate_file {
 sub __snapshot_delete_vol_snapshot {
     my ($class, $vmid, $ms, $mountpoint, $snapname, $unused) = @_;
 
+    return if $snapname eq 'vzdump' &&
+	!$class->mountpoint_backup_enabled($ms, $mountpoint);
+
     my $storecfg = PVE::Storage::config();
     PVE::Storage::volume_snapshot_delete($storecfg, $mountpoint->{volume}, $snapname);
     push @$unused, $mountpoint->{volume};
@@ -169,6 +174,35 @@ sub __snapshot_rollback_vm_start {
     die "implement me - save vmstate\n";
 }
 
+sub __snapshot_rollback_get_unused {
+    my ($class, $conf, $snap) = @_;
+
+    my $unused = [];
+
+    $class->__snapshot_foreach_volume($conf, sub {
+	my ($vs, $volume) = @_;
+
+	return if $volume->{type} ne 'volume';
+
+	my $found = 0;
+	my $volid = $volume->{volume};
+
+	$class->__snapshot_foreach_volume($snap, sub {
+	    my ($ms, $mountpoint) = @_;
+
+	    return if $found;
+	    return if ($mountpoint->{type} ne 'volume');
+
+	    $found = 1
+		if ($mountpoint->{volume} && $mountpoint->{volume} eq $volid);
+	});
+
+	push @$unused, $volid if !$found;
+    });
+
+    return $unused;
+}
+
 sub __snapshot_foreach_volume {
     my ($class, $conf, $func) = @_;
 
@@ -203,7 +237,7 @@ my $rootfs_desc = {
     },
     ro => {
 	type => 'boolean',
-	description => 'Read-only mountpoint (not supported with bind mounts)',
+	description => 'Read-only mount point',
 	optional => 1,
     },
     quota => {
@@ -211,6 +245,19 @@ my $rootfs_desc = {
 	description => 'Enable user quotas inside the container (not supported with zfs subvolumes)',
 	optional => 1,
     },
+    replicate => {
+	type => 'boolean',
+	description => 'Will include this volume to a storage replica job.',
+	optional => 1,
+	default => 1,
+    },
+    shared => {
+	type => 'boolean',
+	description => 'Mark this non-volume mount point as available on multiple nodes (see \'nodes\')',
+	verbose_description => "Mark this non-volume mount point as available on all nodes.\n\nWARNING: This option does not share the mount point automatically, it assumes it is shared already!",
+	optional => 1,
+	default => 0,
+    },
 };
 
 PVE::JSONSchema::register_standard_option('pve-ct-rootfs', {
@@ -272,6 +319,13 @@ my $confdesc = {
 	maximum => 6,
 	default => 2,
     },
+    cores => {
+	optional => 1,
+	type => 'integer',
+	description => "The number of cores assigned to the container. A container can use all available cores by default.",
+	minimum => 1,
+	maximum => 128,
+    },
     cpulimit => {
 	optional => 1,
 	type => 'number',
@@ -391,8 +445,9 @@ my $valid_lxc_conf_keys = {
     'lxc.rootfs' => 'lxc.rootfs is auto generated from rootfs',
     'lxc.rootfs.mount' => 1,
     'lxc.rootfs.options' => 'lxc.rootfs.options is not supported' .
-                            ', please use mountpoint options in the "rootfs" key',
+                            ', please use mount point options in the "rootfs" key',
     # lxc.cgroup.*
+    # lxc.limit.*
     'lxc.cap.drop' => 1,
     'lxc.cap.keep' => 1,
     'lxc.aa_profile' => 1,
@@ -485,8 +540,8 @@ our $netconf_desc = {
     },
     tag => {
 	type => 'integer',
-	minimum => '1',
-	maximum => '4094',
+	minimum => 1,
+	maximum => 4094,
 	description => "VLAN tag for this interface.",
 	optional => 1,
     },
@@ -537,14 +592,19 @@ my $mp_desc = {
     %$rootfs_desc,
     backup => {
 	type => 'boolean',
-	description => 'Whether to include the mountpoint in backups.',
+	description => 'Whether to include the mount point in backups.',
+	verbose_description => 'Whether to include the mount point in backups '.
+			       '(only used for volume mount points).',
 	optional => 1,
     },
     mp => {
 	type => 'string',
 	format => 'pve-lxc-mp-string',
 	format_description => 'Path',
-	description => 'Path to the mountpoint as seen from inside the container.',
+	description => 'Path to the mount point as seen from inside the container '.
+		       '(must not contain symlinks).',
+	verbose_description => "Path to the mount point as seen from inside the container.\n\n".
+			       "NOTE: Must not contain any symlinks for security reasons."
     },
 };
 PVE::JSONSchema::register_format('pve-ct-mountpoint', $mp_desc);
@@ -608,7 +668,7 @@ sub parse_pct_config {
 	    my $key = $1;
 	    my $value = $3;
 	    my $validity = $valid_lxc_conf_keys->{$key} || 0;
-	    if ($validity eq 1 || $key =~ m/^lxc\.cgroup\./) {
+	    if ($validity eq 1 || $key =~ m/^lxc\.(?:cgroup|limit)\./) {
 		push @{$conf->{lxc}}, [$key, $value];
 	    } elsif (my $errmsg = $validity) {
 		warn "vm $vmid - $key: $errmsg\n";
@@ -723,12 +783,14 @@ sub update_pct_config {
     if (defined($delete)) {
 	foreach my $opt (@$delete) {
 	    if (!exists($conf->{$opt})) {
-		warn "no such option: $opt\n";
+		# silently ignore
 		next;
 	    }
 
-	    if ($opt eq 'hostname' || $opt eq 'memory' || $opt eq 'rootfs') {
+	    if ($opt eq 'memory' || $opt eq 'rootfs') {
 		die "unable to delete required option '$opt'\n";
+	    } elsif ($opt eq 'hostname') {
+		delete $conf->{$opt};
 	    } elsif ($opt eq 'swap') {
 		delete $conf->{$opt};
 		PVE::LXC::write_cgroup_value("memory", $vmid,
@@ -739,6 +801,8 @@ sub update_pct_config {
 		     $opt eq 'tty' || $opt eq 'console' || $opt eq 'cmode') {
 		next if $hotplug_error->($opt);
 		delete $conf->{$opt};
+	    } elsif ($opt eq 'cores') {
+		delete $conf->{$opt}; # rest is handled by pvestatd
 	    } elsif ($opt eq 'cpulimit') {
 		PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", -1);
 		delete $conf->{$opt};
@@ -811,12 +875,13 @@ sub update_pct_config {
 	PVE::LXC::Config->write_config($vmid, $conf) if $running;
     }
 
+    my $storecfg = PVE::Storage::config();
+
     my $used_volids = {};
     my $check_content_type = sub {
 	my ($mp) = @_;
 	my $sid = PVE::Storage::parse_volume_id($mp->{volume});
-	my $scfg = PVE::Storage::config();
-	my $storage_config = PVE::Storage::storage_config($scfg, $sid);
+	my $storage_config = PVE::Storage::storage_config($storecfg, $sid);
 	die "storage '$sid' does not allow content type 'rootdir' (Container)\n"
 	    if !$storage_config->{content}->{rootdir};
     };
@@ -824,7 +889,7 @@ sub update_pct_config {
     foreach my $opt (keys %$param) {
 	my $value = $param->{$opt};
 	my $check_protection_msg = "can't update CT $vmid drive '$opt'";
-	if ($opt eq 'hostname') {
+	if ($opt eq 'hostname' || $opt eq 'arch') {
 	    $conf->{$opt} = $value;
 	} elsif ($opt eq 'onboot') {
 	    $conf->{$opt} = $value ? 1 : 0;
@@ -841,8 +906,14 @@ sub update_pct_config {
 	    next if $hotplug_error->($opt);
 	    my $list = PVE::LXC::verify_searchdomain_list($value);
 	    $conf->{$opt} = $list;
+	} elsif ($opt eq 'cores') {
+	    $conf->{$opt} = $value;# rest is handled by pvestatd
 	} elsif ($opt eq 'cpulimit') {
-	    PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", int(100000*$value));
+	    if ($value == 0) {
+		PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", -1);
+	    } else {
+		PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", int(100000*$value));
+	    }
 	    $conf->{$opt} = $value;
 	} elsif ($opt eq 'cpuunits') {
 	    $conf->{$opt} = $value;
@@ -901,6 +972,7 @@ sub update_pct_config {
 	} else {
 	    die "implement me: $opt";
 	}
+
 	PVE::LXC::Config->write_config($vmid, $conf) if $running;
     }
 
@@ -1040,7 +1112,10 @@ sub parse_lxc_network {
     $res = PVE::JSONSchema::parse_property_string($netconf_desc, $data);
 
     $res->{type} = 'veth';
-    $res->{hwaddr} = PVE::Tools::random_ether_addr() if !$res->{hwaddr};
+    if (!$res->{hwaddr}) {
+	my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');
+	$res->{hwaddr} = PVE::Tools::random_ether_addr($dc->{mac_prefix});
+    }
 
     return $res;
 }
@@ -1087,6 +1162,19 @@ sub has_dev_console {
     return !(defined($conf->{console}) && !$conf->{console});
 }
 
+sub has_lxc_entry {
+    my ($class, $conf, $keyname) = @_;
+
+    if (my $lxcconf = $conf->{lxc}) {
+	foreach my $entry (@$lxcconf) {
+	    my ($key, undef) = @$entry;
+	    return 1 if $key eq $keyname;
+	}
+    }
+
+    return 0;
+}
+
 sub get_tty_count {
     my ($class, $conf) = @_;
 
@@ -1112,7 +1200,7 @@ sub mountpoint_names {
 }
 
 sub foreach_mountpoint_full {
-    my ($class, $conf, $reverse, $func) = @_;
+    my ($class, $conf, $reverse, $func, @param) = @_;
 
     foreach my $key ($class->mountpoint_names($reverse)) {
 	my $value = $conf->{$key};
@@ -1120,20 +1208,20 @@ sub foreach_mountpoint_full {
 	my $mountpoint = $key eq 'rootfs' ? $class->parse_ct_rootfs($value, 1) : $class->parse_ct_mountpoint($value, 1);
 	next if !defined($mountpoint);
 
-	&$func($key, $mountpoint);
+	&$func($key, $mountpoint, @param);
     }
 }
 
 sub foreach_mountpoint {
-    my ($class, $conf, $func) = @_;
+    my ($class, $conf, $func, @param) = @_;
 
-    $class->foreach_mountpoint_full($conf, 0, $func);
+    $class->foreach_mountpoint_full($conf, 0, $func, @param);
 }
 
 sub foreach_mountpoint_reverse {
-    my ($class, $conf, $func) = @_;
+    my ($class, $conf, $func, @param) = @_;
 
-    $class->foreach_mountpoint_full($conf, 1, $func);
+    $class->foreach_mountpoint_full($conf, 1, $func, @param);
 }
 
 sub get_vm_volumes {
@@ -1158,4 +1246,62 @@ sub get_vm_volumes {
     return $vollist;
 }
 
-return 1;
+sub get_replicatable_volumes {
+    my ($class, $storecfg, $vmid, $conf, $cleanup, $noerr) = @_;
+
+    my $volhash = {};
+
+    my $test_volid = sub {
+	my ($volid, $mountpoint) = @_;
+
+	return if !$volid;
+
+	my $mptype = $mountpoint->{type};
+	die "unable to replicate mountpoint type '$mptype'\n"
+	    if $mptype ne 'volume';
+
+	my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, $noerr);
+	return if !$storeid;
+
+	my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+	return if $scfg->{shared};
+
+	my ($path, $owner, $vtype) = PVE::Storage::path($storecfg, $volid);
+	return if !$owner || ($owner != $vmid);
+
+	die "unable to replicate volume '$volid', type '$vtype'\n" if $vtype ne 'images';
+
+	return if !$cleanup && defined($mountpoint->{replicate}) && !$mountpoint->{replicate};
+
+	if (!PVE::Storage::volume_has_feature($storecfg, 'replicate', $volid)) {
+	    return if $cleanup || $noerr;
+	    die "missing replicate feature on volume '$volid'\n";
+	}
+
+	$volhash->{$volid} = 1;
+    };
+
+    $class->foreach_mountpoint($conf, sub {
+	my ($ms, $mountpoint) = @_;
+	$test_volid->($mountpoint->{volume}, $mountpoint);
+    });
+
+    foreach my $snapname (keys %{$conf->{snapshots}}) {
+	my $snap = $conf->{snapshots}->{$snapname};
+	$class->foreach_mountpoint($snap, sub {
+	    my ($ms, $mountpoint) = @_;
+	    $test_volid->($mountpoint->{volume}, $mountpoint);
+        });
+    }
+
+    # add 'unusedX' volumes to volhash
+    foreach my $key (keys %$conf) {
+	if ($key =~ m/^unused/) {
+	    $test_volid->($conf->{$key}, { type => 'volume', replicate => 1 });
+	}
+    }
+
+    return $volhash;
+}
+
+1;