openstack/heat
Code Issues Proposed changes

Merge "destroy failed instances created by auto scaling"

Browse Source
This commit is contained in:
Jenkins 2013-07-01 11:45:46 +00:00 committed by Gerrit Code Review
commit 99d849228b
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/resources/autoscaling.py
View File

@ -192,9 +192,15 @@ class InstanceGroup(resource.Resource):
try:
yield inst.create()
except exception.ResourceFailure:
except exception.ResourceFailure as ex:
if raise_on_error:
raise
# Handle instance creation failure locally by destroying the
# failed instance to avoid orphaned instances costing user
# extra memory
logger.warn('Creating %s instance %d failed %s, destroying'
% (str(self), index, str(ex)))
inst.destroy()
else:
inst_list.append(name)
self.resource_id_set(','.join(inst_list))

28
heat/tests/test_autoscaling.py
View File

@ -561,6 +561,34 @@ class AutoScalingTest(HeatTestCase):
rsrc.resource_id)
self.m.VerifyAll()
def test_scaling_group_scale_up_failure(self):
t = template_format.parse(as_template)
stack = parse_stack(t)
# Create initial group
self._stub_lb_reload(['WebServerGroup-0'])
now = timeutils.utcnow()
self._stub_meta_expected(now, 'ExactCapacity : 1')
self._stub_create(1)
self.m.ReplayAll()
rsrc = self.create_scaling_group(t, stack, 'WebServerGroup')
self.assertEqual('WebServerGroup-0', rsrc.resource_id)
self.m.VerifyAll()
self.m.UnsetStubs()
# Scale up one 1 instance with resource failure
self.m.StubOutWithMock(instance.Instance, 'handle_create')
exc = exception.ResourceFailure(Exception())
instance.Instance.handle_create().AndRaise(exc)
self.m.StubOutWithMock(instance.Instance, 'destroy')
instance.Instance.destroy()
self.m.ReplayAll()
rsrc.adjust(1)
self.assertEqual('WebServerGroup-0', rsrc.resource_id)
self.m.VerifyAll()
def test_scaling_group_nochange(self):
t = template_format.parse(as_template)
stack = parse_stack(t)