shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F OpenNebula/one#5621: Fix soft limit unit

Browse Source 
This commit also improves LXC logging by setting the log configuration to the container definition file.
This commit is contained in:
Daniel Clavijo Coca 2022-03-18 03:39:54 -06:00 committed by GitHub
parent a840317a87
commit c6a065cf2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/vmm_mad/remotes/lib/lxc/client.rb
View File

@ -37,7 +37,6 @@ class LXCClient
COMMANDS.each_value do |value|
value.prepend 'sudo '
value << ' --logpriority ERROR'
end
# Returns LXC version

8
src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb
View File

@ -151,7 +151,7 @@ class LXCVM < OpenNebulaVM
memory = limits_memory
lxc["#{pre}memory.#{CGROUP_NAMES[cg_set][:memory_max]}"] = memory
lxc["#{pre}memory.#{CGROUP_NAMES[cg_set][:memory_low]}"] = (memory.chomp.to_f*0.9).ceil
lxc["#{pre}memory.#{CGROUP_NAMES[cg_set][:memory_low]}"] = "#{(memory.chomp.to_f*0.9).ceil}M"
lxc["#{pre}memory.#{CGROUP_NAMES[cg_set][:swap]}"] = limits_memory_swap('LXC_SWAP') if swap_limitable?
@ -178,6 +178,12 @@ class LXCVM < OpenNebulaVM
# Add profiles
lxc['lxc.include'] |= parse_profiles
# logging
# 0 = trace, 1 = debug, 2 = info, 3 = notice, 4 = warn,
# 5 = error, 6 = critical, 7 = alert, 8 = fatal
lxc['lxc.log.level'] = 5
lxc['lxc.log.file'] = "/var/log/lxc/one-#{@vm_id}.log"
# Parse RAW section (lxc values should prevail over raw section values)
lxc = parse_raw.merge(lxc)