Revision c8457ce7 lib/jqueue.py
| b/lib/jqueue.py | ||
|---|---|---|
| 601 | 601 |
assert node_name != self._my_hostname |
| 602 | 602 |
|
| 603 | 603 |
# Clean queue directory on added node |
| 604 |
rpc.RpcRunner.call_jobqueue_purge(node_name) |
|
| 604 |
result = rpc.RpcRunner.call_jobqueue_purge(node_name) |
|
| 605 |
msg = result.RemoteFailMsg() |
|
| 606 |
if msg: |
|
| 607 |
logging.warning("Cannot cleanup queue directory on node %s: %s",
|
|
| 608 |
node_name, msg) |
|
| 605 | 609 |
|
| 606 | 610 |
if not node.master_candidate: |
| 607 | 611 |
# remove if existing, ignoring errors |
| ... | ... | |
| 626 | 630 |
result = rpc.RpcRunner.call_jobqueue_update([node_name], |
| 627 | 631 |
[node.primary_ip], |
| 628 | 632 |
file_name, content) |
| 629 |
if not result[node_name]: |
|
| 630 |
logging.error("Failed to upload %s to %s", file_name, node_name)
|
|
| 633 |
msg = result[node_name].RemoteFailMsg() |
|
| 634 |
if msg: |
|
| 635 |
logging.error("Failed to upload file %s to node %s: %s",
|
|
| 636 |
file_name, node_name, msg) |
|
| 631 | 637 |
|
| 632 | 638 |
self._nodes[node_name] = node.primary_ip |
| 633 | 639 |
|
| ... | ... | |
| 664 | 670 |
success = [] |
| 665 | 671 |
|
| 666 | 672 |
for node in nodes: |
| 667 |
if result[node]: |
|
| 668 |
success.append(node) |
|
| 669 |
else: |
|
| 673 |
msg = result[node].RemoteFailMsg() |
|
| 674 |
if msg: |
|
| 670 | 675 |
failed.append(node) |
| 671 |
|
|
| 672 |
if failed: |
|
| 673 |
logging.error("%s failed on %s", failmsg, ", ".join(failed))
|
|
| 676 |
logging.error("RPC call %s failed on node %s: %s",
|
|
| 677 |
result[node].call, node, msg) |
|
| 678 |
else: |
|
| 679 |
success.append(node) |
|
| 674 | 680 |
|
| 675 | 681 |
# +1 for the master node |
| 676 | 682 |
if (len(success) + 1) < len(failed): |
Also available in: Unified diff