Commit 159d4ec6 authored by Iustin Pop's avatar Iustin Pop
Browse files

Remove the OpRetryError exception



This is only used in two places, in an error path that is no longer
valid since Ganeti 2.0. We remove the try..except since we should not
get it anymore (and if we do, then we should catch it in all
config.Update cases) and we remove the exception class completely.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 3e53a60b
......@@ -8109,12 +8109,7 @@ class LUAddTags(TagsLU):
self.target.AddTag(tag)
except errors.TagError, err:
raise errors.OpExecError("Error while setting tag: %s" % str(err))
try:
self.cfg.Update(self.target, feedback_fn)
except errors.ConfigurationError:
raise errors.OpRetryError("There has been a modification to the"
" config file and the operation has been"
" aborted. Please retry.")
self.cfg.Update(self.target, feedback_fn)
class LUDelTags(TagsLU):
......@@ -8148,12 +8143,7 @@ class LUDelTags(TagsLU):
"""
for tag in self.op.tags:
self.target.RemoveTag(tag)
try:
self.cfg.Update(self.target, feedback_fn)
except errors.ConfigurationError:
raise errors.OpRetryError("There has been a modification to the"
" config file and the operation has been"
" aborted. Please retry.")
self.cfg.Update(self.target, feedback_fn)
class LUTestDelay(NoHooksLU):
......
......@@ -134,12 +134,6 @@ class OpExecError(GenericError):
"""
class OpRetryError(OpExecError):
"""Error during OpCode execution, action can be retried.
"""
class OpCodeUnknown(GenericError):
"""Unknown opcode submitted.
......
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