proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-28 13:00:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebalance_lxc_containers: do not use vmstatus, call from updata_status

Browse Source 
Simply use PVE::LXC::config_list() and test if there is a cgroup.
This commit is contained in:
Dietmar Maurer 2016-10-26 15:47:08 +02:00
parent 07f9595f80
commit e0dc09ad0f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/Service/pvestatd.pm
View File

@ -226,7 +226,6 @@ my $persistent_container_order = {};
my $persistent_container_order_counter = 0;
sub rebalance_lxc_containers {
my ($vmstatus) = @_;
return if !-d '/sys/fs/cgroup/cpuset/lxc'; # nothing to do...
@ -237,9 +236,10 @@ sub rebalance_lxc_containers {
my @cpu_ctcount = (0) x $PVE::CpuSet::MAX_CPUID;
my @balanced_cts;
foreach my $vmid (sort keys %$vmstatus) {
my $d = $vmstatus->{$vmid};
next if !$d->{pid};
my $ctlist = PVE::LXC::config_list();
foreach my $vmid (sort keys %$ctlist) {
next if ! -d "/sys/fs/cgroup/cpuset/lxc/$vmid";
my ($conf, $cpuset);
eval {
@ -349,8 +349,6 @@ sub update_lxc_status {
$plugin->update_lxc_status($plugin_config, $vmid, $d, $ctime);
}
}
rebalance_lxc_containers($vmstatus);
}
sub update_storage_status {
@ -412,6 +410,12 @@ sub update_status {
$err = $@;
syslog('err', "lxc status update error: $err") if $err;
eval {
rebalance_lxc_containers();
};
$err = $@;
syslog('err', "lxc cpuset rebalance error: $err") if $err;
eval {
update_storage_status($status_cfg);
};