From a381174523b2cf2e89bb679c4841e33817b1a14e Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 12 Nov 2008 12:51:39 +0000
Subject: [PATCH] jqueue: Always use rpc.RpcRunner
"from ganeti.rpc import RpcRunner" does not conform to the style guide.
Reviewed-by: iustinp
---
lib/jqueue.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/jqueue.py b/lib/jqueue.py
index 4ad1397a8..40fee0027 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -47,8 +47,6 @@ from ganeti import utils
from ganeti import jstore
from ganeti import rpc
-from ganeti.rpc import RpcRunner
-
JOBQUEUE_THREADS = 25
@@ -548,7 +546,7 @@ class JobQueue(object):
assert node_name != self._my_hostname
# Clean queue directory on added node
- RpcRunner.call_jobqueue_purge(node_name)
+ rpc.RpcRunner.call_jobqueue_purge(node_name)
# Upload the whole queue excluding archived jobs
files = [self._GetJobPath(job_id) for job_id in self._GetJobIDsUnlocked()]
@@ -564,8 +562,9 @@ class JobQueue(object):
finally:
fd.close()
- result = RpcRunner.call_jobqueue_update([node_name], [node.primary_ip],
- file_name, content)
+ result = rpc.RpcRunner.call_jobqueue_update([node_name],
+ [node.primary_ip],
+ file_name, content)
if not result[node_name]:
logging.error("Failed to upload %s to %s", file_name, node_name)
@@ -644,7 +643,7 @@ class JobQueue(object):
utils.WriteFile(file_name, data=data)
names, addrs = self._GetNodeIp()
- result = RpcRunner.call_jobqueue_update(names, addrs, file_name, data)
+ result = rpc.RpcRunner.call_jobqueue_update(names, addrs, file_name, data)
self._CheckRpcResult(result, self._nodes,
"Updating %s" % file_name)
@@ -663,7 +662,7 @@ class JobQueue(object):
os.rename(old, new)
names, addrs = self._GetNodeIp()
- result = RpcRunner.call_jobqueue_rename(names, addrs, old, new)
+ result = rpc.RpcRunner.call_jobqueue_rename(names, addrs, old, new)
self._CheckRpcResult(result, self._nodes,
"Moving %s to %s" % (old, new))
--
GitLab