Convergence: Assign current_template_id when resource fails

When a resource was being updated and a failure occurs, we are not
setting the rsrc.current_template_id.

The rsrc.current_template_id should also be set when resource failure
occurs, since it was acted upon using the current template.

Change-Id: I5dfda012f36a05691af8fc490560bf9fca043662
Closes-bug: #1495363

1 files changed, 12 insertions, 7 deletions

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 9e80c190f..780be3f4f 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -869,19 +869,24 @@ class Resource(object):
         resource's requires to list of the required resource id from the
         given resource_data and existing resource's requires.
         '''
-        with self.lock(engine_id):
-            new_temp = template.Template.load(self.context, template_id)
-            new_res_def = new_temp.resource_definitions(self.stack)[self.name]
-            runner = scheduler.TaskRunner(self.update, new_res_def)
-            runner(timeout=timeout)
-
-            # update the resource db record (stored in unlock)
+        def update_tmpl_id_and_requires():
             self.current_template_id = template_id
             self.requires = list(
                 set(data[u'id'] for data in resource_data.values()
                     if data is not None)
             )
 
+        with self.lock(engine_id):
+            new_temp = template.Template.load(self.context, template_id)
+            new_res_def = new_temp.resource_definitions(self.stack)[self.name]
+            runner = scheduler.TaskRunner(self.update, new_res_def)
+            try:
+                runner(timeout=timeout)
+                update_tmpl_id_and_requires()
+            except exception.ResourceFailure:
+                update_tmpl_id_and_requires()
+                raise
+
     @scheduler.wrappertask
     def update(self, after, before=None, prev_resource=None):
         '''