Merge lp:~gnuoy/charms/trusty/nova-compute/hugepage-sub-trigger into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

This change sets the requests hugepage value down the relation with the neutron plugin subordinate charm. The reason for this is so that the subordinate can react to a change in that value and restart any services. This is a feature that was requested by cisco for the cisco-vpp charm

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14477 nova-compute-next for gnuoy mp278817
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14477/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13496 nova-compute-next for gnuoy mp278817
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/13526567/
Build: http://10.245.162.77:8080/job/charm_unit_test/13496/

[lp:~gnuoy/charms/trusty/nova-compute/hugepage-sub-trigger]

185. By Liam Young on 2015-11-27

Fix unit test

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8040 nova-compute-next for gnuoy mp278817
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13527056/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8040/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14478 nova-compute-next for gnuoy mp278817
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14478/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13497 nova-compute-next for gnuoy mp278817
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13497/

[James Page (james-page)]

Aside from the amulet test failure this looks OK to me; please remedy as required.

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8041 nova-compute-next for gnuoy mp278817
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13528847/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8041/

[Liam Young (gnuoy)]

Both amulet fails look unrelated to this branch. Both are deployments timeouts which look to me to be issues with the testing infrastructure.

[Ryan Beisner (1chb1n)]

Indeed, 1 instance/unit didn't come up in the amulet test.

2 pending 172.17.104.135 b78bcaf9-94ab-49b6-8e9d-0385e21ab05a wily arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova

Rerunning...

[James Page (james-page)]

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8065 nova-compute-next for gnuoy mp278817
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13600756/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8065/

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-11-16 14:39:46 +0000
+++ hooks/nova_compute_hooks.py	2015-11-27 14:39:23 +0000
@@ -70,6 +70,7 @@
     install_hugepages,
     REQUIRED_INTERFACES,
     check_optional_relations,
+    get_hugepage_number,
 )
 
 from charmhelpers.contrib.network.ip import (
@@ -149,6 +150,9 @@
     for rid in relation_ids('zeromq-configuration'):
         zeromq_configuration_relation_joined(rid)
 
+    for rid in relation_ids('neutron-plugin'):
+        neutron_plugin_joined(rid)
+
     if is_relation_made("nrpe-external-master"):
         update_nrpe_config()
 
@@ -377,6 +381,12 @@
     nrpe_setup.write()
 
 
[e-mail]('neutron-plugin-relation-joined')
+def neutron_plugin_joined(relid=None):
+    relation_set(relation_id=relid,
+                 hugepage_number=get_hugepage_number())
+
+
 @hooks.hook('neutron-plugin-relation-changed')
 @restart_on_change(restart_map())
 def neutron_plugin_changed():

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-10-30 05:49:18 +0000
+++ hooks/nova_compute_utils.py	2015-11-27 14:39:23 +0000
@@ -802,27 +802,32 @@
     apt_install(LATE_GIT_PACKAGES, fatal=True)
 
 
+def get_hugepage_number():
+    # TODO: defaults to 2M - this should probably be configurable
+    #       and support multiple pool sizes - e.g. 2M and 1G.
+    hugepage_size = 2048
+    hugepage_config = config('hugepages')
+    if hugepage_config.endswith('%'):
+        import psutil
+        mem = psutil.virtual_memory()
+        hugepage_config_pct = hugepage_config.strip('%')
+        hugepage_multiplier = float(hugepage_config_pct) / 100
+        hugepages = int((mem.total * hugepage_multiplier) / hugepage_size)
+    else:
+        hugepages = int(hugepage_config)
+    return hugepages
+
+
 def install_hugepages():
     """ Configure hugepages """
     hugepage_config = config('hugepages')
     if hugepage_config:
-        # TODO: defaults to 2M - this should probably be configurable
-        #       and support multiple pool sizes - e.g. 2M and 1G.
-        hugepage_size = 2048
-        if hugepage_config.endswith('%'):
-            import psutil
-            mem = psutil.virtual_memory()
-            hugepage_config_pct = hugepage_config.strip('%')
-            hugepage_multiplier = float(hugepage_config_pct) / 100
-            hugepages = int((mem.total * hugepage_multiplier) / hugepage_size)
-        else:
-            hugepages = int(hugepage_config)
         mnt_point = '/run/hugepages/kvm'
         hugepage_support(
             'nova',
             mnt_point=mnt_point,
             group='root',
-            nr_hugepages=hugepages,
+            nr_hugepages=get_hugepage_number(),
             mount=False,
             set_shmmax=True,
         )

=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-10-06 16:58:22 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-11-27 14:39:23 +0000
@@ -124,8 +124,10 @@
         hooks.config_changed()
         self.assertFalse(self.do_openstack_upgrade.called)
 
+    @patch.object(hooks, 'neutron_plugin_joined')
     @patch.object(hooks, 'compute_joined')
-    def test_config_changed_with_migration(self, compute_joined):
+    def test_config_changed_with_migration(self, compute_joined,
+                                           neutron_plugin_joined):
         self.git_install_requested.return_value = False
         self.migration_enabled.return_value = True
         _zmq_joined = self.patch('zeromq_configuration_relation_joined')
@@ -143,8 +145,10 @@
         self.assertTrue(self.initialize_ssh_keys.called)
         self.assertTrue(_zmq_joined.called)
 
+    @patch.object(hooks, 'neutron_plugin_joined')
     @patch.object(hooks, 'compute_joined')
-    def test_config_changed_with_resize(self, compute_joined):
+    def test_config_changed_with_resize(self, compute_joined,
+                                        neutron_plugin_joined):
         self.git_install_requested.return_value = False
         self.test_config.set('enable-resize', True)
         _zmq_joined = self.patch('zeromq_configuration_relation_joined')
@@ -162,8 +166,10 @@
         self.enable_shell.assert_called_with(user='nova')
         self.assertTrue(_zmq_joined.called)
 
+    @patch.object(hooks, 'neutron_plugin_joined')
     @patch.object(hooks, 'compute_joined')
-    def test_config_changed_without_resize(self, compute_joined):
+    def test_config_changed_without_resize(self, compute_joined,
+                                           neutron_plugin_joined):
         self.git_install_requested.return_value = False
         self.test_config.set('enable-resize', False)
         _zmq_joined = self.patch('zeromq_configuration_relation_joined')