Revision 55de1d68 lib/cmdlib.py

b/lib/cmdlib.py
6510 6510 
  for disk in disks:
6511 6511 
    for node, top_disk in disk.ComputeNodeTree(instance.primary_node):
6512 6512 
      lu.cfg.SetDiskID(top_disk, node)
6513 
      result = lu.rpc.call_blockdev_shutdown(node, top_disk)
6513 
      result = lu.rpc.call_blockdev_shutdown(node, (top_disk, instance))
6514 6514 
      msg = result.fail_msg
6515 6515 
      if msg:
6516 6516 
        lu.LogWarning("Could not shutdown block device %s on node %s: %s",
......
8494 8494 
      disks = _ExpandCheckDisks(instance, instance.disks)
8495 8495 
      self.feedback_fn("* unmapping instance's disks from %s" % source_node)
8496 8496 
      for disk in disks:
8497 
        result = self.rpc.call_blockdev_shutdown(source_node, disk)
8497 
        result = self.rpc.call_blockdev_shutdown(source_node, (disk, instance))
8498 8498 
        msg = result.fail_msg
8499 8499 
        if msg:
8500 8500 
          logging.error("Migration was successful, but couldn't unmap the"
......
11161 11161 
    for idx, dev in enumerate(self.instance.disks):
11162 11162 
      self.lu.LogInfo("Shutting down drbd for disk/%d on old node" % idx)
11163 11163 
      self.cfg.SetDiskID(dev, self.target_node)
11164 
      msg = self.rpc.call_blockdev_shutdown(self.target_node, dev).fail_msg
11164 
      msg = self.rpc.call_blockdev_shutdown(self.target_node,
11165 
                                            (dev, self.instance)).fail_msg
11165 11166 
      if msg:
11166 11167 
        self.lu.LogWarning("Failed to shutdown drbd for disk/%d on old"
11167 11168 
                           "node: %s" % (idx, msg),

Also available in: Unified diff