Merge lp:~gnuoy/charm-helpers/max_map_count into lp:charm-helpers

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/core/hugepage.py'
--- charmhelpers/core/hugepage.py	2015-09-17 11:04:18 +0000
+++ charmhelpers/core/hugepage.py	2015-10-20 08:33:11 +0000
@@ -46,6 +46,8 @@
     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,

=== modified file 'tests/core/test_hugepage.py'
--- tests/core/test_hugepage.py	2015-09-17 11:04:18 +0000
+++ tests/core/test_hugepage.py	2015-10-20 08:33:11 +0000
@@ -100,3 +100,16 @@
         }
         sysctl_setting_arg = self.sysctl.create.call_args_list[0][0][0]
         self.assertEqual(yaml.load(sysctl_setting_arg), sysctl_expect)
+
+    def test_hugepage_support_auto_increase_max_map_count(self):
+        self.add_group.return_value = Group()
+        hugepage.hugepage_support(
+            'nova', group='neutron', nr_hugepages=512, max_map_count=200,
+            mnt_point='/hugepages', pagesize='1G', mount=False)
+        sysctl_expect = {
+            'vm.hugetlb_shm_group': '1010',
+            'vm.max_map_count': 1024,
+            'vm.nr_hugepages': 512,
+        }
+        sysctl_setting_arg = self.sysctl.create.call_args_list[0][0][0]
+        self.assertEqual(yaml.load(sysctl_setting_arg), sysctl_expect)