Revision 9d4bfc96 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 673 | 673 |
|
| 674 | 674 |
if 'nodelist' not in node_result: |
| 675 | 675 |
bad = True |
| 676 |
feedback_fn(" - ERROR: node hasn't returned node connectivity data")
|
|
| 676 |
feedback_fn(" - ERROR: node hasn't returned node ssh connectivity data")
|
|
| 677 | 677 |
else: |
| 678 | 678 |
if node_result['nodelist']: |
| 679 | 679 |
bad = True |
| 680 | 680 |
for node in node_result['nodelist']: |
| 681 |
feedback_fn(" - ERROR: communication with node '%s': %s" %
|
|
| 681 |
feedback_fn(" - ERROR: ssh communication with node '%s': %s" %
|
|
| 682 | 682 |
(node, node_result['nodelist'][node])) |
| 683 |
if 'node-net-test' not in node_result: |
|
| 684 |
bad = True |
|
| 685 |
feedback_fn(" - ERROR: node hasn't returned node tcp connectivity data")
|
|
| 686 |
else: |
|
| 687 |
if node_result['node-net-test']: |
|
| 688 |
bad = True |
|
| 689 |
nlist = utils.NiceSort(node_result['node-net-test'].keys()) |
|
| 690 |
for node in nlist: |
|
| 691 |
feedback_fn(" - ERROR: tcp communication with node '%s': %s" %
|
|
| 692 |
(node, node_result['node-net-test'][node])) |
|
| 693 |
|
|
| 683 | 694 |
hyp_result = node_result.get('hypervisor', None)
|
| 684 | 695 |
if hyp_result is not None: |
| 685 | 696 |
feedback_fn(" - ERROR: hypervisor verify failure: '%s'" % hyp_result)
|
| ... | ... | |
| 817 | 828 |
|
| 818 | 829 |
vg_name = self.cfg.GetVGName() |
| 819 | 830 |
nodelist = utils.NiceSort(self.cfg.GetNodeList()) |
| 831 |
nodeinfo = [self.cfg.GetNodeInfo(nname) for nname in nodelist] |
|
| 820 | 832 |
instancelist = utils.NiceSort(self.cfg.GetInstanceList()) |
| 821 | 833 |
i_non_redundant = [] # Non redundant instances |
| 822 | 834 |
node_volume = {}
|
| ... | ... | |
| 839 | 851 |
'filelist': file_names, |
| 840 | 852 |
'nodelist': nodelist, |
| 841 | 853 |
'hypervisor': None, |
| 854 |
'node-net-test': [(node.name, node.primary_ip, node.secondary_ip) |
|
| 855 |
for node in nodeinfo] |
|
| 842 | 856 |
} |
| 843 | 857 |
all_nvinfo = rpc.call_node_verify(nodelist, node_verify_param) |
| 844 | 858 |
all_rversion = rpc.call_version(nodelist) |
Also available in: Unified diff