Commit e22af31d authored by Guido Trotter's avatar Guido Trotter
Browse files

Remove errors.ConfdFatalError



This exception is caught, but never thrown. It became useless when we
moved confd from on/off to enabled/disabled, but always running on all
nodes. Removing its definition and the code catching it can do no harm.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 85dbfd78
......@@ -147,9 +147,6 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
# new watch. This is not a race condition, though, since we're anyway
# going to realod the file after setting up the new watch.
self.callback(False)
except errors.ConfdFatalError, err:
logging.critical("Critical error, shutting down: %s", err)
sys.exit(constants.EXIT_FAILURE)
except:
# we need to catch any exception here, log it, but proceed, because even
# if we failed handling a single request, we still want the confd to
......@@ -165,9 +162,6 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
try:
self.callback(True)
except errors.ConfdFatalError, err:
logging.critical("Critical error, shutting down: %s", err)
sys.exit(constants.EXIT_FAILURE)
except:
# we need to catch any exception here, log it, but proceed, because even
# if we failed handling a single request, we still want the confd to
......
......@@ -305,15 +305,6 @@ class JobQueueFull(JobQueueError):
"""
class ConfdFatalError(GenericError):
"""A fatal failure in Ganeti confd.
Events that compromise the ability of confd to proceed further.
(for example: inability to load the config file)
"""
class ConfdRequestError(GenericError):
"""A request error in Ganeti confd.
......
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