Revision 5627f375

b/lib/bootstrap.py
132 132
                             " had exitcode %s and error %s" %
133 133
                             (result.cmd, result.exit_code, result.output))
134 134

  
135
  # Wait for node daemon to become responsive
135
  _WaitForNodeDaemon(master_name)
136

  
137

  
138
def _WaitForNodeDaemon(node_name):
139
  """Wait for node daemon to become responsive.
140

  
141
  """
136 142
  def _CheckNodeDaemon():
137
    result = rpc.RpcRunner.call_version([master_name])[master_name]
143
    result = rpc.RpcRunner.call_version([node_name])[node_name]
138 144
    if result.fail_msg:
139 145
      raise utils.RetryAgain()
140 146

  
141 147
  try:
142 148
    utils.Retry(_CheckNodeDaemon, 1.0, 10.0)
143 149
  except utils.RetryTimeout:
144
    raise errors.OpExecError("Node daemon didn't answer queries within"
145
                             " 10 seconds")
150
    raise errors.OpExecError("Node daemon on %s didn't answer queries within"
151
                             " 10 seconds" % node_name)
152

  
146 153

  
147 154
def InitCluster(cluster_name, mac_prefix,
148 155
                master_netdev, file_storage_dir, candidate_pool_size,
......
426 433
                             " output: %s" %
427 434
                             (node, result.fail_reason, result.output))
428 435

  
436
  _WaitForNodeDaemon(node)
437

  
429 438

  
430 439
def MasterFailover(no_voting=False):
431 440
  """Failover the master node.

Also available in: Unified diff