Revision a3811745
b/lib/jqueue.py | ||
---|---|---|
47 | 47 |
from ganeti import jstore |
48 | 48 |
from ganeti import rpc |
49 | 49 |
|
50 |
from ganeti.rpc import RpcRunner |
|
51 |
|
|
52 | 50 |
JOBQUEUE_THREADS = 25 |
53 | 51 |
|
54 | 52 |
|
... | ... | |
548 | 546 |
assert node_name != self._my_hostname |
549 | 547 |
|
550 | 548 |
# Clean queue directory on added node |
551 |
RpcRunner.call_jobqueue_purge(node_name) |
|
549 |
rpc.RpcRunner.call_jobqueue_purge(node_name)
|
|
552 | 550 |
|
553 | 551 |
# Upload the whole queue excluding archived jobs |
554 | 552 |
files = [self._GetJobPath(job_id) for job_id in self._GetJobIDsUnlocked()] |
... | ... | |
564 | 562 |
finally: |
565 | 563 |
fd.close() |
566 | 564 |
|
567 |
result = RpcRunner.call_jobqueue_update([node_name], [node.primary_ip], |
|
568 |
file_name, content) |
|
565 |
result = rpc.RpcRunner.call_jobqueue_update([node_name], |
|
566 |
[node.primary_ip], |
|
567 |
file_name, content) |
|
569 | 568 |
if not result[node_name]: |
570 | 569 |
logging.error("Failed to upload %s to %s", file_name, node_name) |
571 | 570 |
|
... | ... | |
644 | 643 |
utils.WriteFile(file_name, data=data) |
645 | 644 |
|
646 | 645 |
names, addrs = self._GetNodeIp() |
647 |
result = RpcRunner.call_jobqueue_update(names, addrs, file_name, data) |
|
646 |
result = rpc.RpcRunner.call_jobqueue_update(names, addrs, file_name, data)
|
|
648 | 647 |
self._CheckRpcResult(result, self._nodes, |
649 | 648 |
"Updating %s" % file_name) |
650 | 649 |
|
... | ... | |
663 | 662 |
os.rename(old, new) |
664 | 663 |
|
665 | 664 |
names, addrs = self._GetNodeIp() |
666 |
result = RpcRunner.call_jobqueue_rename(names, addrs, old, new) |
|
665 |
result = rpc.RpcRunner.call_jobqueue_rename(names, addrs, old, new)
|
|
667 | 666 |
self._CheckRpcResult(result, self._nodes, |
668 | 667 |
"Moving %s to %s" % (old, new)) |
669 | 668 |
|
Also available in: Unified diff