Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

activate storage before starting containers

Browse Source
This commit is contained in:
Dietmar Maurer 2012-04-18 12:09:48 +02:00
parent fa9c209163
commit 6a92d3a1fc
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PVE/API2/OpenVZ.pm
View File

@ -59,6 +59,15 @@ CPUUNITS="1000"
CPUS="1" CPUS="1"
__EOD __EOD
my $get_container_storage = sub {
my ($stcfg, $vmid, $veconf) = @_;
my $path = PVE::OpenVZ::get_privatedir($veconf, $vmid);
my ($vtype, $volid) = PVE::Storage::path_to_volume_id($stcfg, $path);
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1) if $volid;
return wantarray ? ($sid, $volname, $path) : $sid;
};
my $check_ct_modify_config_perm = sub { my $check_ct_modify_config_perm = sub {
my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_; my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_;
@ -725,12 +734,8 @@ __PACKAGE__->register_method({
my $stcfg = cfs_read_file("storage.cfg"); my $stcfg = cfs_read_file("storage.cfg");
if ($veconf->{ve_private} && $veconf->{ve_private}->{value}) { my ($sid, undef, $path) = &$get_container_storage($stcfg, $param->{vmid}, $veconf);
my $path = PVE::OpenVZ::get_privatedir($veconf, $param->{vmid}); $conf->{storage} = $sid || $path;
my ($vtype, $volid) = PVE::Storage::path_to_volume_id($stcfg, $path);
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1) if $volid;
$conf->{storage} = $sid || $path;
}
my $properties = PVE::OpenVZ::json_config_properties(); my $properties = PVE::OpenVZ::json_config_properties();
@ -1074,6 +1079,12 @@ __PACKAGE__->register_method({
syslog('info', "starting CT $vmid: $upid\n"); syslog('info', "starting CT $vmid: $upid\n");
my $veconf = PVE::OpenVZ::load_config($vmid);
my $stcfg = cfs_read_file("storage.cfg");
if (my $sid = &$get_container_storage($stcfg, $vmid, $veconf)) {
PVE::Storage::activate_storage($stcfg, $sid);
}
my $cmd = ['vzctl', 'start', $vmid]; my $cmd = ['vzctl', 'start', $vmid];
run_command($cmd); run_command($cmd);

2
debian/changelog.Debian vendored
View File

@ -1,6 +1,8 @@
pve-manager (2.0-63) unstable; urgency=low pve-manager (2.0-63) unstable; urgency=low
* fix bug 128: implement pvectl startall/stopall * fix bug 128: implement pvectl startall/stopall
* fix bug 171: activate storage before starting containers
-- Proxmox Support Team <support@proxmox.com> Wed, 18 Apr 2012 10:02:54 +0200 -- Proxmox Support Team <support@proxmox.com> Wed, 18 Apr 2012 10:02:54 +0200