From 83b77df247d2b06fbc618827020e4c50fbe074b6 Mon Sep 17 00:00:00 2001 From: Kengo Takahara Date: Fri, 5 Jan 2018 15:26:36 +0900 Subject: [PATCH] Ignore '409 Conflict' when adding reserved_host to aggregate This patch modifies that masakari-engine ignores '409 Conflict' when adding reserved_host to aggregate. Change-Id: I4603df36370154a8168d53b74c551feefc13cb4b Closes-Bug: #1739383 --- .../engine/drivers/taskflow/host_failure.py | 13 +++++- .../taskflow/test_host_failure_flow.py | 41 +++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/masakari/engine/drivers/taskflow/host_failure.py b/masakari/engine/drivers/taskflow/host_failure.py index c67765ac..a647b111 100644 --- a/masakari/engine/drivers/taskflow/host_failure.py +++ b/masakari/engine/drivers/taskflow/host_failure.py @@ -252,8 +252,17 @@ class EvacuateInstancesTask(base.MasakariTask): aggregates = self.novaclient.get_aggregate_list(context) for aggregate in aggregates: if host_name in aggregate.hosts: - self.novaclient.add_host_to_aggregate( - context, reserved_host.name, aggregate) + try: + self.novaclient.add_host_to_aggregate( + context, reserved_host.name, aggregate) + except exception.Conflict: + msg = ("Host '%(reserved_host)s' already has " + "been added to aggregate " + "'%(aggregate)s'.") + LOG.info(msg, + {'reserved_host': reserved_host.name, + 'aggregate': aggregate.name}) + # A failed compute host can be associated with # multiple aggregates but operators will not # associate it with multiple aggregates in real diff --git a/masakari/tests/unit/engine/drivers/taskflow/test_host_failure_flow.py b/masakari/tests/unit/engine/drivers/taskflow/test_host_failure_flow.py index 5f8ccb04..17d48867 100644 --- a/masakari/tests/unit/engine/drivers/taskflow/test_host_failure_flow.py +++ b/masakari/tests/unit/engine/drivers/taskflow/test_host_failure_flow.py @@ -166,6 +166,47 @@ class HostFailureTestCase(test.TestCase): self.assertIn(reserved_host.name, self.fake_client.aggregates.get('1').hosts) + @mock.patch.object(nova.API, 'add_host_to_aggregate') + @mock.patch('masakari.compute.nova.novaclient') + @mock.patch('masakari.engine.drivers.taskflow.host_failure.LOG') + def test_host_failure_flow_ignores_conflict_error( + self, mock_log, _mock_novaclient, mock_add_host, mock_unlock, + mock_lock, mock_enable_disable): + _mock_novaclient.return_value = self.fake_client + mock_add_host.side_effect = exception.Conflict + self.override_config("add_reserved_host_to_aggregate", + True, "host_failure") + + # create test data + self.fake_client.servers.create(id="1", host=self.instance_host, + ha_enabled=True) + reserved_host = fakes.create_fake_host(name="fake-reserved-host", + reserved=True) + self.fake_client.aggregates.create(id="1", name='fake_agg', + hosts=[self.instance_host, + reserved_host.name]) + expected_msg_format = "Host '%(reserved_host)s' already has been " \ + "added to aggregate '%(aggregate)s'." + expected_msg_params = {'aggregate': 'fake_agg', + 'reserved_host': u'fake-reserved-host'} + + # execute DisableComputeServiceTask + self._test_disable_compute_service(mock_enable_disable) + + # execute PrepareHAEnabledInstancesTask + instance_list = self._test_instance_list(1) + + # execute EvacuateInstancesTask + with mock.patch.object(host_obj.Host, "save") as mock_save: + self._evacuate_instances( + instance_list, mock_enable_disable, + reserved_host=reserved_host) + self.assertEqual(1, mock_save.call_count) + self.assertIn(reserved_host.name, + self.fake_client.aggregates.get('1').hosts) + mock_log.info.assert_any_call( + expected_msg_format, expected_msg_params) + @ddt.data('active', 'rescued', 'paused', 'shelved', 'suspended', 'error', 'stopped', 'resized') @mock.patch('masakari.compute.nova.novaclient')