Revision ad24e046 lib/cmdlib.py

b/lib/cmdlib.py
2858 2858
        elif field == "mac":
2859 2859
          val = instance.nics[0].mac
2860 2860
        elif field == "sda_size" or field == "sdb_size":
2861
          disk = instance.FindDisk(field[:3])
2862
          if disk is None:
2861
          idx = ord(field[2]) - ord('a')
2862
          try:
2863
            val = instance.FindDisk(idx).size
2864
          except errors.OpPrereqError:
2863 2865
            val = None
2864
          else:
2865
            val = disk.size
2866 2866
        elif field == "tags":
2867 2867
          val = list(instance.GetTags())
2868 2868
        elif field == "serial_no":
......
4479 4479
      raise errors.OpPrereqError("Instance's disk layout does not support"
4480 4480
                                 " growing.")
4481 4481

  
4482
    if instance.FindDisk(self.op.disk) is None:
4483
      raise errors.OpPrereqError("Disk '%s' not found for instance '%s'" %
4484
                                 (self.op.disk, instance.name))
4482
    self.disk = instance.FindDisk(self.op.disk)
4485 4483

  
4486 4484
    nodenames = [instance.primary_node] + list(instance.secondary_nodes)
4487 4485
    nodeinfo = self.rpc.call_node_info(nodenames, self.cfg.GetVGName(),
......
4505 4503

  
4506 4504
    """
4507 4505
    instance = self.instance
4508
    disk = instance.FindDisk(self.op.disk)
4506
    disk = self.disk
4509 4507
    for node in (instance.secondary_nodes + (instance.primary_node,)):
4510 4508
      self.cfg.SetDiskID(disk, node)
4511 4509
      result = self.rpc.call_blockdev_grow(node, disk, self.op.amount)

Also available in: Unified diff