From 0db7ac4d0e9375eb78dc7259f5cf44827847ac6e Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 23 Jun 2008 15:00:16 +0000
Subject: [PATCH] Handle any exception in ganeti-masterd
If an uncaught exception is thrown currently it destroys the calling
thread. This patch changes the behaviour to failing the current job,
logging a message, but trying to keep the daemon up.
Reviewed-by: imsnah
---
daemons/ganeti-masterd | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 8b02ac6af..92718b9af 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -288,6 +288,15 @@ def PoolWorker(worker_id, incoming_queue):
msg = "ganeti exception %s" % err
item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
print msg
+ except Exception, err:
+ msg = "unhandled exception %s" % err
+ item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
+ print msg
+ except:
+ msg = "unhandled unknown exception"
+ item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
+ print msg
+
finally:
#utils.Unlock('cmd')
#utils.LockCleanup()
--
GitLab