Revision 3924700f
b/lib/cmdlib.py | ||
---|---|---|
691 | 691 |
needed_mem = 0 |
692 | 692 |
for instance in instances: |
693 | 693 |
bep = self.cfg.GetClusterInfo().FillBE(instance_cfg[instance]) |
694 |
needed_mem += bep[constants.BE_MEMORY] |
|
694 |
if bep[constants.BE_AUTOBALANCE]: |
|
695 |
needed_mem += bep[constants.BE_MEMORY] |
|
695 | 696 |
if nodeinfo['mfree'] < needed_mem: |
696 | 697 |
feedback_fn(" - ERROR: not enough memory on node %s to accomodate" |
697 | 698 |
" failovers should node %s fail" % (node, prinode)) |
... | ... | |
736 | 737 |
nodeinfo = [self.cfg.GetNodeInfo(nname) for nname in nodelist] |
737 | 738 |
instancelist = utils.NiceSort(self.cfg.GetInstanceList()) |
738 | 739 |
i_non_redundant = [] # Non redundant instances |
740 |
i_non_a_balanced = [] # Non auto-balanced instances |
|
739 | 741 |
node_volume = {} |
740 | 742 |
node_instance = {} |
741 | 743 |
node_info = {} |
... | ... | |
765 | 767 |
all_ninfo = self.rpc.call_node_info(nodelist, self.cfg.GetVGName(), |
766 | 768 |
self.cfg.GetHypervisorType()) |
767 | 769 |
|
770 |
cluster = self.cfg.GetClusterInfo() |
|
768 | 771 |
for node in nodelist: |
769 | 772 |
feedback_fn("* Verifying node %s" % node) |
770 | 773 |
result = self._VerifyNode(node, file_names, local_checksums, |
... | ... | |
854 | 857 |
feedback_fn(" - WARNING: multiple secondaries for instance %s" |
855 | 858 |
% instance) |
856 | 859 |
|
860 |
if not cluster.FillBE(inst_config)[constants.BE_AUTOBALANCE]: |
|
861 |
i_non_a_balanced.append(instance) |
|
862 |
|
|
857 | 863 |
for snode in inst_config.secondary_nodes: |
858 | 864 |
if snode in node_info: |
859 | 865 |
node_info[snode]['sinst'].append(instance) |
... | ... | |
884 | 890 |
feedback_fn(" - NOTICE: %d non-redundant instance(s) found." |
885 | 891 |
% len(i_non_redundant)) |
886 | 892 |
|
893 |
if i_non_a_balanced: |
|
894 |
feedback_fn(" - NOTICE: %d non-auto-balanced instance(s) found." |
|
895 |
% len(i_non_a_balanced)) |
|
896 |
|
|
887 | 897 |
return not bad |
888 | 898 |
|
889 | 899 |
def HooksCallBack(self, phase, hooks_results, feedback_fn, lu_result): |
Also available in: Unified diff