Reset resource replaced_by field for rollback
We seem to leave replaced_by field of a resource after rollback (if a stack cancel is issued before the replacement resource is added to the stack). This in turn results in the stack getting stuck in IN_PROGRESS for further updates. Change-Id: I3361ad90e303d24a16a943408fe0f6c406cf785f Co-Authored-By: Zane Bitter <zbitter@redhat.com> Task: #19582 Story: #2001974
This commit is contained in:
parent
86a1cc8c47
commit
a544ce43dc
|
@ -1446,6 +1446,7 @@ class Resource(status.ResourceStatus):
|
||||||
self.state_set(self.UPDATE, self.FAILED,
|
self.state_set(self.UPDATE, self.FAILED,
|
||||||
six.text_type(failure))
|
six.text_type(failure))
|
||||||
raise failure
|
raise failure
|
||||||
|
self.replaced_by = None
|
||||||
|
|
||||||
runner = scheduler.TaskRunner(self.update, new_res_def,
|
runner = scheduler.TaskRunner(self.update, new_res_def,
|
||||||
new_template_id=template_id,
|
new_template_id=template_id,
|
||||||
|
|
|
@ -24,9 +24,9 @@ LOG = logging.getLogger(__name__)
|
||||||
class TestResource(resource.Resource):
|
class TestResource(resource.Resource):
|
||||||
|
|
||||||
PROPERTIES = (
|
PROPERTIES = (
|
||||||
A, C, CA, rA, rB
|
A, B, C, CA, rA, rB
|
||||||
) = (
|
) = (
|
||||||
'a', 'c', 'ca', '!a', '!b'
|
'a', 'b', 'c', 'ca', '!a', '!b'
|
||||||
)
|
)
|
||||||
|
|
||||||
ATTRIBUTES = (
|
ATTRIBUTES = (
|
||||||
|
@ -42,6 +42,12 @@ class TestResource(resource.Resource):
|
||||||
default='a',
|
default='a',
|
||||||
update_allowed=True
|
update_allowed=True
|
||||||
),
|
),
|
||||||
|
B: properties.Schema(
|
||||||
|
properties.Schema.STRING,
|
||||||
|
_('Fake property b.'),
|
||||||
|
default='b',
|
||||||
|
update_allowed=True
|
||||||
|
),
|
||||||
C: properties.Schema(
|
C: properties.Schema(
|
||||||
properties.Schema.STRING,
|
properties.Schema.STRING,
|
||||||
_('Fake property c.'),
|
_('Fake property c.'),
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
example_template = Template({
|
||||||
|
'A': RsrcDef({'a': 'initial'}, []),
|
||||||
|
'B': RsrcDef({}, []),
|
||||||
|
'C': RsrcDef({'!a': GetAtt('A', 'a'), 'b': 'val1'}, []),
|
||||||
|
'D': RsrcDef({'c': GetRes('C')}, []),
|
||||||
|
'E': RsrcDef({'ca': GetAtt('C', '!a')}, []),
|
||||||
|
})
|
||||||
|
engine.create_stack('foo', example_template)
|
||||||
|
engine.noop(5)
|
||||||
|
engine.call(verify, example_template)
|
||||||
|
|
||||||
|
example_template_updated = Template({
|
||||||
|
'A': RsrcDef({'a': 'updated'}, []),
|
||||||
|
'B': RsrcDef({}, []),
|
||||||
|
'C': RsrcDef({'!a': GetAtt('A', 'a'), 'b': 'val1'}, []),
|
||||||
|
'D': RsrcDef({'c': GetRes('C')}, []),
|
||||||
|
'E': RsrcDef({'ca': GetAtt('C', '!a')}, []),
|
||||||
|
})
|
||||||
|
engine.update_stack('foo', example_template_updated)
|
||||||
|
engine.noop(3)
|
||||||
|
|
||||||
|
engine.rollback_stack('foo')
|
||||||
|
engine.noop(12)
|
||||||
|
engine.call(verify, example_template)
|
||||||
|
|
||||||
|
example_template_final = Template({
|
||||||
|
'A': RsrcDef({'a': 'initial'}, []),
|
||||||
|
'B': RsrcDef({}, []),
|
||||||
|
'C': RsrcDef({'!a': GetAtt('A', 'a'), 'b': 'val2'}, []),
|
||||||
|
'D': RsrcDef({'c': GetRes('C')}, []),
|
||||||
|
'E': RsrcDef({'ca': GetAtt('C', '!a')}, []),
|
||||||
|
})
|
||||||
|
|
||||||
|
engine.update_stack('foo', example_template_final)
|
||||||
|
engine.noop(3)
|
||||||
|
engine.call(verify, example_template_final)
|
||||||
|
engine.noop(4)
|
||||||
|
|
||||||
|
engine.delete_stack('foo')
|
||||||
|
engine.noop(6)
|
||||||
|
engine.call(verify, Template({}))
|
Loading…
Reference in New Issue