From d8e0dc1767552b1021190f329306308a0d7582a9 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 14 Jun 2010 13:17:33 +0100
Subject: [PATCH] jqueue: simplify removal from _nodes
Somewhere we do try/del/except and somewhere just pop. Using pop
everywhere saves lines of code.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/jqueue.py | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/lib/jqueue.py b/lib/jqueue.py
index d6b20ea92..1102c6513 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -621,10 +621,7 @@ class JobQueue(object):
if n.master_candidate)
# Remove master node
- try:
- del self._nodes[self._my_hostname]
- except KeyError:
- pass
+ self._nodes.pop(self._my_hostname, None)
# TODO: Check consistency across nodes
@@ -734,11 +731,7 @@ class JobQueue(object):
@param node_name: the name of the node to remove
"""
- try:
- # The queue is removed by the "leave node" RPC call.
- del self._nodes[node_name]
- except KeyError:
- pass
+ self._nodes.pop(node_name, None)
@staticmethod
def _CheckRpcResult(result, nodes, failmsg):
--
GitLab