Revision 3efa9051

b/lib/backend.py
1374 1374
  for dsk in disks:
1375 1375
    rbd = _RecursiveFindBD(dsk)
1376 1376
    if rbd is None:
1377
      raise errors.BlockDeviceError("Can't find device %s" % str(dsk))
1377
      _Fail("Can't find device %s", dsk)
1378 1378
    stats.append(rbd.CombinedSyncStatus())
1379
  return stats
1379
  return True, stats
1380 1380

  
1381 1381

  
1382 1382
def _RecursiveFindBD(disk):
b/lib/cmdlib.py
1688 1688
    done = True
1689 1689
    cumul_degraded = False
1690 1690
    rstats = lu.rpc.call_blockdev_getmirrorstatus(node, instance.disks)
1691
    if rstats.failed or not rstats.data:
1692
      lu.LogWarning("Can't get any data from node %s", node)
1691
    msg = rstats.RemoteFailMsg()
1692
    if msg:
1693
      lu.LogWarning("Can't get any data from node %s: %s", node, msg)
1693 1694
      retries += 1
1694 1695
      if retries >= 10:
1695 1696
        raise errors.RemoteError("Can't contact node %s for mirror data,"
1696 1697
                                 " aborting." % node)
1697 1698
      time.sleep(6)
1698 1699
      continue
1699
    rstats = rstats.data
1700
    rstats = rstats.payload
1700 1701
    retries = 0
1701 1702
    for i, mstat in enumerate(rstats):
1702 1703
      if mstat is None:

Also available in: Unified diff