Revision 425f0f54 lib/bootstrap.py

b/lib/bootstrap.py
560 560
    logging.error("Could not disable the master role on the old master"
561 561
                 " %s, please disable manually: %s", old_master, msg)
562 562

  
563
  master_ip = sstore.GetMasterIP()
564
  total_timeout = 30
563 565
  # Here we have a phase where no master should be running
566
  def _check_ip():
567
    if utils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT):
568
      raise utils.RetryAgain()
569

  
570
  try:
571
    utils.Retry(_check_ip, (1, 1.5, 5), total_timeout)
572
  except utils.RetryTimeout:
573
    logging.warning("The master IP is still reachable after %s seconds,"
574
                    " continuing but activating the master on the current"
575
                    " node will probably fail", total_timeout)
564 576

  
565 577
  # instantiate a real config writer, as we now know we have the
566 578
  # configuration data

Also available in: Unified diff