Revision 53c14ef1 lib/cmdlib.py

b/lib/cmdlib.py
2459 2459
    for node, node_disk in inst_disk.ComputeNodeTree(instance.primary_node):
2460 2460
      lu.cfg.SetDiskID(node_disk, node)
2461 2461
      result = lu.rpc.call_blockdev_assemble(node, node_disk, iname, False)
2462
      if result.failed or not result:
2462
      msg = result.RemoteFailMsg()
2463
      if msg:
2463 2464
        lu.proc.LogWarning("Could not prepare block device %s on node %s"
2464
                           " (is_primary=False, pass=1)",
2465
                           inst_disk.iv_name, node)
2465
                           " (is_primary=False, pass=1): %s",
2466
                           inst_disk.iv_name, node, msg)
2466 2467
        if not ignore_secondaries:
2467 2468
          disks_ok = False
2468 2469

  
......
2475 2476
        continue
2476 2477
      lu.cfg.SetDiskID(node_disk, node)
2477 2478
      result = lu.rpc.call_blockdev_assemble(node, node_disk, iname, True)
2478
      if result.failed or not result:
2479
      msg = result.RemoteFailMsg()
2480
      if msg:
2479 2481
        lu.proc.LogWarning("Could not prepare block device %s on node %s"
2480
                           " (is_primary=True, pass=2)",
2481
                           inst_disk.iv_name, node)
2482
                           " (is_primary=True, pass=2): %s",
2483
                           inst_disk.iv_name, node, msg)
2482 2484
        disks_ok = False
2483 2485
    device_info.append((instance.primary_node, inst_disk.iv_name, result.data))
2484 2486

  

Also available in: Unified diff