9c12812735
Some major changes: * the charm has been rebased (from a Python perspective) to be rooted in the charm directory. This is a single root. * Imports have been changed so that the don't add lots of imports to the namespace of the module doing the import. * The code that used to run at module import time has been made lazy such that it only has to run if the relevant functions are called. This includes restart_on_change parameters, the harden function and the parameters to the guard_map. Appropriate changes will be submitted to charm-helpers. * Several tests had to be re-written as (incorrect) mocking meant that text fixtures didn't actually match what the code was doing. Thus, the tests were meaningless. * This has had a net positive impact on the unit tests wrt to importing modules and mocking. Change-Id: Id07d9d1caaa9b29453a63c2e49ba831071e9457f
70 lines
2.6 KiB
Python
70 lines
2.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright 2014-2015 Canonical Limited.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import yaml
|
|
from charmhelpers.core import fstab
|
|
from charmhelpers.core import sysctl
|
|
from charmhelpers.core.host import (
|
|
add_group,
|
|
add_user_to_group,
|
|
fstab_mount,
|
|
mkdir,
|
|
)
|
|
from charmhelpers.core.strutils import bytes_from_string
|
|
from subprocess import check_output
|
|
|
|
|
|
def hugepage_support(user, group='hugetlb', nr_hugepages=256,
|
|
max_map_count=65536, mnt_point='/run/hugepages/kvm',
|
|
pagesize='2MB', mount=True, set_shmmax=False):
|
|
"""Enable hugepages on system.
|
|
|
|
Args:
|
|
user (str) -- Username to allow access to hugepages to
|
|
group (str) -- Group name to own hugepages
|
|
nr_hugepages (int) -- Number of pages to reserve
|
|
max_map_count (int) -- Number of Virtual Memory Areas a process can own
|
|
mnt_point (str) -- Directory to mount hugepages on
|
|
pagesize (str) -- Size of hugepages
|
|
mount (bool) -- Whether to Mount hugepages
|
|
"""
|
|
group_info = add_group(group)
|
|
gid = group_info.gr_gid
|
|
add_user_to_group(user, group)
|
|
if max_map_count < 2 * nr_hugepages:
|
|
max_map_count = 2 * nr_hugepages
|
|
sysctl_settings = {
|
|
'vm.nr_hugepages': nr_hugepages,
|
|
'vm.max_map_count': max_map_count,
|
|
'vm.hugetlb_shm_group': gid,
|
|
}
|
|
if set_shmmax:
|
|
shmmax_current = int(check_output(['sysctl', '-n', 'kernel.shmmax']))
|
|
shmmax_minsize = bytes_from_string(pagesize) * nr_hugepages
|
|
if shmmax_minsize > shmmax_current:
|
|
sysctl_settings['kernel.shmmax'] = shmmax_minsize
|
|
sysctl.create(yaml.dump(sysctl_settings), '/etc/sysctl.d/10-hugepage.conf')
|
|
mkdir(mnt_point, owner='root', group='root', perms=0o755, force=False)
|
|
lfstab = fstab.Fstab()
|
|
fstab_entry = lfstab.get_entry_by_attr('mountpoint', mnt_point)
|
|
if fstab_entry:
|
|
lfstab.remove_entry(fstab_entry)
|
|
entry = lfstab.Entry('nodev', mnt_point, 'hugetlbfs',
|
|
'mode=1770,gid={},pagesize={}'.format(gid, pagesize), 0, 0)
|
|
lfstab.add_entry(entry)
|
|
if mount:
|
|
fstab_mount(mnt_point)
|