diff options
| -rwxr-xr-x | nova/compute/manager.py | 14 | ||||
| -rw-r--r-- | nova/compute/utils.py | 9 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 72 |
3 files changed, 89 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e8f21e9ce..3f6d828e1 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -840,10 +840,14 @@ class ComputeManager(manager.SchedulerDependentManager): extra_usage_info = {} def notify(status, msg=None): - """Send a create.{start,end} notification.""" + """Send a create.{start,error,end} notification.""" type_ = "create.%(status)s" % dict(status=status) + info = extra_usage_info.copy() + if not msg: + msg = "" + info['message'] = msg self._notify_about_instance_usage(context, instance, type_, - extra_usage_info=extra_usage_info) + extra_usage_info=info) try: image_meta = self._prebuild_instance(context, instance) @@ -855,20 +859,22 @@ class ComputeManager(manager.SchedulerDependentManager): instance = self._build_instance(context, request_spec, filter_properties, requested_networks, injected_files, admin_password, is_first_time, node, instance, image_meta) - notify("end") # notify that build is done + notify("end", msg=_("Success")) # notify that build is done except exception.RescheduledException as e: # Instance build encountered an error, and has been rescheduled. - pass + notify("error", msg=unicode(e)) # notify that build failed except exception.BuildAbortException as e: # Instance build aborted due to a non-failure LOG.info(e) + notify("end", msg=unicode(e)) # notify that build is done except Exception as e: # Instance build encountered a non-recoverable error: with excutils.save_and_reraise_exception(): self._set_instance_error_state(context, instance['uuid']) + notify("error", msg=unicode(e)) # notify that build failed def _prebuild_instance(self, context, instance): self._check_instance_exists(context, instance) diff --git a/nova/compute/utils.py b/nova/compute/utils.py index 797bb9f1a..24ace0702 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -245,9 +245,14 @@ def notify_about_instance_usage(context, instance, event_suffix, usage_info = notifications.info_from_instance(context, instance, network_info, system_metadata, **extra_usage_info) + if event_suffix.endswith("error"): + level = notifier_api.ERROR + else: + level = notifier_api.INFO + notifier_api.notify(context, 'compute.%s' % host, - 'compute.instance.%s' % event_suffix, - notifier_api.INFO, usage_info) + 'compute.instance.%s' % event_suffix, level, + usage_info) def get_nw_info_for_instance(instance): diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index bff3b66cb..9cb55025b 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -2114,9 +2114,81 @@ class ComputeTestCase(BaseTestCase): self.assertTrue(payload['launched_at']) image_ref_url = glance.generate_image_url(FAKE_IMAGE_REF) self.assertEquals(payload['image_ref_url'], image_ref_url) + self.assertEqual('Success', payload['message']) self.compute.terminate_instance(self.context, instance=jsonutils.to_primitive(inst_ref)) + def test_run_instance_end_notification_on_abort(self): + # Test that an end notif is sent if the build is aborted + instance = jsonutils.to_primitive(self._create_fake_instance()) + instance_uuid = instance['uuid'] + + def build_inst_abort(*args, **kwargs): + raise exception.BuildAbortException(reason="already deleted", + instance_uuid=instance_uuid) + + self.stubs.Set(self.compute, '_build_instance', build_inst_abort) + + self.compute.run_instance(self.context, instance=instance) + self.assertEquals(len(test_notifier.NOTIFICATIONS), 2) + msg = test_notifier.NOTIFICATIONS[0] + self.assertEquals(msg['event_type'], 'compute.instance.create.start') + msg = test_notifier.NOTIFICATIONS[1] + + self.assertEquals(msg['event_type'], 'compute.instance.create.end') + self.assertEquals('INFO', msg['priority']) + payload = msg['payload'] + message = payload['message'] + self.assertTrue(message.find("already deleted") != -1) + + def test_run_instance_error_notification_on_reschedule(self): + # Test that error notif is sent if the build got rescheduled + instance = jsonutils.to_primitive(self._create_fake_instance()) + instance_uuid = instance['uuid'] + + def build_inst_fail(*args, **kwargs): + raise exception.RescheduledException(instance_uuid=instance_uuid, + reason="something bad happened") + + self.stubs.Set(self.compute, '_build_instance', build_inst_fail) + + self.compute.run_instance(self.context, instance=instance) + + self.assertTrue(len(test_notifier.NOTIFICATIONS) >= 2) + msg = test_notifier.NOTIFICATIONS[0] + self.assertEquals(msg['event_type'], 'compute.instance.create.start') + msg = test_notifier.NOTIFICATIONS[1] + + self.assertEquals(msg['event_type'], 'compute.instance.create.error') + self.assertEquals('ERROR', msg['priority']) + payload = msg['payload'] + message = payload['message'] + self.assertTrue(message.find("something bad happened") != -1) + + def test_run_instance_error_notification_on_failure(self): + # Test that error notif is sent if build fails hard + instance = jsonutils.to_primitive(self._create_fake_instance()) + instance_uuid = instance['uuid'] + + def build_inst_fail(*args, **kwargs): + raise test.TestingException("i'm dying") + + self.stubs.Set(self.compute, '_build_instance', build_inst_fail) + + self.assertRaises(test.TestingException, self.compute.run_instance, + self.context, instance=instance) + + self.assertTrue(len(test_notifier.NOTIFICATIONS) >= 2) + msg = test_notifier.NOTIFICATIONS[0] + self.assertEquals(msg['event_type'], 'compute.instance.create.start') + msg = test_notifier.NOTIFICATIONS[1] + + self.assertEquals(msg['event_type'], 'compute.instance.create.error') + self.assertEquals('ERROR', msg['priority']) + payload = msg['payload'] + message = payload['message'] + self.assertTrue(message.find("i'm dying") != -1) + def test_terminate_usage_notification(self): # Ensure terminate_instance generates correct usage notification. old_time = datetime.datetime(2012, 4, 1) |