Revision d3833ebd

b/lib/bootstrap.py
134 134
                             (result.cmd, result.exit_code, result.output))
135 135

  
136 136
  # Wait for node daemon to become responsive
137
  end_time = time.time() + 10.0
138
  while True:
137
  def _CheckNodeDaemon():
139 138
    result = rpc.RpcRunner.call_version([master_name])[master_name]
140
    if not result.fail_msg:
141
      break
142

  
143
    if time.time() > end_time:
144
      raise errors.OpExecError("Node daemon didn't answer queries within"
145
                               " 10 seconds")
146

  
147
    time.sleep(1)
139
    if result.fail_msg:
140
      raise utils.RetryAgain()
148 141

  
142
  try:
143
    utils.Retry(_CheckNodeDaemon, 1.0, 10.0)
144
  except utils.RetryTimeout:
145
    raise errors.OpExecError("Node daemon didn't answer queries within"
146
                             " 10 seconds")
149 147

  
150 148
def InitCluster(cluster_name, mac_prefix,
151 149
                master_netdev, file_storage_dir, candidate_pool_size,

Also available in: Unified diff