Revision 3a26773f lib/config.py

b/lib/config.py
272 272
        result.append("Highest used port mismatch, saved %s, computed %s" %
273 273
                      (data.cluster.highest_used_port, keys[-1]))
274 274

  
275
    if not data.nodes[data.cluster.master_node].master_candidate:
276
      result.append("Master node is not a master candidate")
277

  
275 278
    cp_size = data.cluster.candidate_pool_size
276 279
    num_c = 0
277 280
    for node in data.nodes.values():
278 281
      if node.master_candidate:
279 282
        num_c += 1
280
    if cp_size > num_c:
281
      result.append("Not enough master candidates: actual %d, desired %d" %
282
                    (num_c, cp_size))
283
    if cp_size > num_c and num_c < len(data.nodes):
284
      result.append("Not enough master candidates: actual %d, desired %d,"
285
                    " %d total nodes" % (num_c, cp_size, len(data.nodes)))
283 286

  
284 287
    return result
285 288

  

Also available in: Unified diff