From cc2bea8b13646088fa4311a3fd6bc39a5a668842 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 2 Jul 2008 11:58:39 +0000
Subject: [PATCH] ganeti-masterd: Remove unused locking code

Reviewed-by: iustinp, ultrotter
---
 daemons/ganeti-masterd | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 2e94d933b..ee3d4a23a 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -288,28 +288,21 @@ def PoolWorker(worker_id, incoming_queue, context):
     if item is None:
       break
     logging.debug("worker %s processing job %s", worker_id, item.data.job_id)
-    #utils.Lock('cmd')
+    proc = mcpu.Processor(context, feedback=lambda x: None)
     try:
-      proc = mcpu.Processor(context, feedback=lambda x: None)
-      try:
-        JobRunner(proc, item, context)
-      except errors.GenericError, err:
-        msg = "ganeti exception"
-        logging.error(msg, exc_info=err)
-        item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
-      except Exception, err:
-        msg = "unhandled exception"
-        logging.error(msg, exc_info=err)
-        item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
-      except:
-        msg = "unhandled unknown exception"
-        logging.error(msg, exc_info=True)
-        item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
-
-    finally:
-      #utils.Unlock('cmd')
-      #utils.LockCleanup()
-      pass
+      JobRunner(proc, item, context)
+    except errors.GenericError, err:
+      msg = "ganeti exception"
+      logging.error(msg, exc_info=err)
+      item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
+    except Exception, err:
+      msg = "unhandled exception"
+      logging.error(msg, exc_info=err)
+      item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
+    except:
+      msg = "unhandled unknown exception"
+      logging.error(msg, exc_info=True)
+      item.SetStatus(opcodes.Job.STATUS_FAIL, result=[msg])
     logging.debug("worker %s finish job %s", worker_id, item.data.job_id)
   logging.debug("worker %s exiting", worker_id)
 
-- 
GitLab