Revision 9b0e86e2 lib/cmdlib/cluster.py

b/lib/cmdlib/cluster.py
1874 1874 
                    constants.CV_EINSTANCEFAULTYDISK, instance,
1875 1875 
                    "couldn't retrieve status for disk/%s on %s: %s",
1876 1876 
                    idx, self.cfg.GetNodeName(nname), bdev_status)
1877 
      self._ErrorIf((inst_config.disks_active and
1878 
                     success and
1879 
                     bdev_status.ldisk_status == constants.LDS_FAULTY),
1880 
                    constants.CV_EINSTANCEFAULTYDISK, instance,
1881 
                    "disk/%s on %s is faulty", idx, self.cfg.GetNodeName(nname))
1877 

  		





  
  1878
  
    
      if inst_config.disks_active and success and \


  		





  
  1879
  
    
         (bdev_status.is_degraded or


  		





  
  1880
  
    
          bdev_status.ldisk_status != constants.LDS_OKAY):


  		





  
  1881
  
    
        msg = "disk/%s on %s" % (idx, self.cfg.GetNodeName(nname))


  		





  
  1882
  
    
        if bdev_status.is_degraded:


  		





  
  1883
  
    
          msg += " is degraded"


  		





  
  1884
  
    
        if bdev_status.ldisk_status != constants.LDS_OKAY:


  		





  
  1885
  
    
          msg += "; state is '%s'" % \


  		





  
  1886
  
    
                 constants.LDS_NAMES[bdev_status.ldisk_status]


  		





  
  1887
  
    

  		





  
  1888
  
    
        self._Error(constants.CV_EINSTANCEFAULTYDISK, instance, msg)


  		





  1882
  1889
  
    

  		





  1883
  1890
  
    
    self._ErrorIf(pnode_img.rpc_fail and not pnode_img.offline,


  		





  1884
  1891
  
    
                  constants.CV_ENODERPC, pnode, "instance %s, connection to"


  		












Also available in:
  Unified diff