Revision 1d4a4b26 lib/cmdlib/cluster.py

b/lib/cmdlib/cluster.py
1779 1779
      # node here
1780 1780
      snode = node_image[nname]
1781 1781
      bad_snode = snode.ghost or snode.offline
1782
      _ErrorIf(inst_config.admin_state == constants.ADMINST_UP and
1782
      _ErrorIf(inst_config.disks_active and
1783 1783
               not success and not bad_snode,
1784 1784
               constants.CV_EINSTANCEFAULTYDISK, instance,
1785 1785
               "couldn't retrieve status for disk/%s on %s: %s",
1786 1786
               idx, nname, bdev_status)
1787
      _ErrorIf((inst_config.admin_state == constants.ADMINST_UP and
1787
      _ErrorIf((inst_config.disks_active and
1788 1788
                success and bdev_status.ldisk_status == constants.LDS_FAULTY),
1789 1789
               constants.CV_EINSTANCEFAULTYDISK, instance,
1790 1790
               "disk/%s on %s is faulty", idx, nname)
......
2062 2062
        node_drbd[minor] = (instance, False)
2063 2063
      else:
2064 2064
        instance = instanceinfo[instance]
2065
        node_drbd[minor] = (instance.name,
2066
                            instance.admin_state == constants.ADMINST_UP)
2065
        node_drbd[minor] = (instance.name, instance.disks_active)
2067 2066

  
2068 2067
    # and now check them
2069 2068
    used_minors = nresult.get(constants.NV_DRBDLIST, [])

Also available in: Unified diff