konevsa/pve-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rebalance_lxc_containers: make it work with old style lxc setups

Browse Source
This commit is contained in:
Dietmar Maurer 2016-12-21 12:20:40 +01:00
parent 729f1b2d42
commit abe9e9dac0
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/Service/pvestatd.pm
View File

@ -245,17 +245,24 @@ sub rebalance_lxc_containers {
}
eval {
# allow all, so that we can set new cpuset in /ns
$all_cpus->write_to_cgroup("lxc/$vmid");
eval {
$newset->write_to_cgroup("lxc/$vmid/ns");
};
if (my $err = $@) {
warn $err if !$rebalance_error_count->{$vmid}++;
# restore original
$cpuset->write_to_cgroup("lxc/$vmid");
if (-d "/sys/fs/cgroup/cpuset/lxc/$vmid/ns") {
# allow all, so that we can set new cpuset in /ns
$all_cpus->write_to_cgroup("lxc/$vmid");
eval {
$newset->write_to_cgroup("lxc/$vmid/ns");
};
if (my $err = $@) {
warn $err if !$rebalance_error_count->{$vmid}++;
# restore original
$cpuset->write_to_cgroup("lxc/$vmid");
} else {
# also apply to container root cgroup
$newset->write_to_cgroup("lxc/$vmid");
$rebalance_error_count->{$vmid} = 0;
}
} else {
# also apply to container root cgroup
# old style container
$newset->write_to_cgroup("lxc/$vmid");
$rebalance_error_count->{$vmid} = 0;
}