← Back to branch summary

~billy-olsen/charms/trusty/keystone/lp1500635+reverseproxy

« back to all changes in this revision

Viewing changes to charmhelpers/core/hugepage.py

  • Committer: Liam Young
  • Date: 2015-09-28 12:39:04 UTC
  • mfrom: (177.2.1 keystone.lp1499643)
  • Revision ID: liam.young@canonical.com-20150928123904-omyimc2cu68kzvdo
[hopem, r=gnuoy] Sync charmhelpers to get fix for bug 1499643

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/core/hugepage.py
25
25
    fstab_mount,
26
26
    mkdir,
27
27
)
 
28
from charmhelpers.core.strutils import bytes_from_string
 
29
from subprocess import check_output
28
30
 
29
31
 
30
32
def hugepage_support(user, group='hugetlb', nr_hugepages=256,
31
33
                     max_map_count=65536, mnt_point='/run/hugepages/kvm',
32
 
                     pagesize='2MB', mount=True):
 
34
                     pagesize='2MB', mount=True, set_shmmax=False):
33
35
    """Enable hugepages on system.
34
36
 
35
37
    Args:
49
51
        'vm.max_map_count': max_map_count,
50
52
        'vm.hugetlb_shm_group': gid,
51
53
    }
 
54
    if set_shmmax:
 
55
        shmmax_current = int(check_output(['sysctl', '-n', 'kernel.shmmax']))
 
56
        shmmax_minsize = bytes_from_string(pagesize) * nr_hugepages
 
57
        if shmmax_minsize > shmmax_current:
 
58
            sysctl_settings['kernel.shmmax'] = shmmax_minsize
52
59
    sysctl.create(yaml.dump(sysctl_settings), '/etc/sysctl.d/10-hugepage.conf')
53
60
    mkdir(mnt_point, owner='root', group='root', perms=0o755, force=False)
54
61
    lfstab = fstab.Fstab()