Revision 4cfb9426

b/lib/cmdlib.py
5326 5326 
                                     " an instance")
5327 5327 
        ins_l = self.rpc.call_instance_list([pnode], [instance.hypervisor])
5328 5328 
        ins_l = ins_l[pnode]
5329 
        if not type(ins_l) is list:
5329 
        if ins_l.failed or not isinstance(ins_l.data, list):
5330 5330 
          raise errors.OpPrereqError("Can't contact node '%s'" % pnode)
5331 
        if instance.name in ins_l:
5331 
        if instance.name in ins_l.data:
5332 5332 
          raise errors.OpPrereqError("Instance is running, can't remove"
5333 5333 
                                     " disks.")
5334 5334 

  		





  ......




  5366
  5366
  
    
        device_idx = len(instance.disks)


  		





  5367
  5367
  
    
        for node, disk in device.ComputeNodeTree(instance.primary_node):


  		





  5368
  5368
  
    
          self.cfg.SetDiskID(disk, node)


  		





  5369
  
  
    
          result = self.rpc.call_blockdev_remove(node, disk)


  		





  5370
  
  
    
          if result.failed or not result.data:


  		





  
  5369
  
    
          rpc_result = self.rpc.call_blockdev_remove(node, disk)


  		





  
  5370
  
    
          if rpc_result.failed or not rpc_result.data:


  		





  5371
  5371
  
    
            self.proc.LogWarning("Could not remove disk/%d on node %s,"


  		





  5372
  5372
  
    
                                 " continuing anyway", device_idx, node)


  		





  5373
  5373
  
    
        result.append(("disk/%d" % device_idx, "remove"))


  		












Also available in:
  Unified diff