Commit 66223061 authored by Petr Pudlak's avatar Petr Pudlak
Browse files

Fix calls to Update in LUInstanceSetParams



In particular, move the call to Update so that it doesn't conflict with
calls to ConfigWriter methods that change the configuration state.
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 4c04ae43
......@@ -3799,6 +3799,8 @@ class LUInstanceSetParams(LogicalUnit):
# Show the Private(...) blurb.
result.append(("os_private/%s" % key, repr(val)))
self.cfg.Update(self.instance, feedback_fn, self.proc.GetECId())
if self.op.offline is None:
# Ignore
pass
......@@ -3811,8 +3813,6 @@ class LUInstanceSetParams(LogicalUnit):
self.cfg.MarkInstanceDown(self.instance.uuid)
result.append(("admin_state", constants.ADMINST_DOWN))
self.cfg.Update(self.instance, feedback_fn, self.proc.GetECId())
assert not (self.owned_locks(locking.LEVEL_NODE_RES) or
self.owned_locks(locking.LEVEL_NODE)), \
"All node locks should have been released by now"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment