On 12/04/2014 04:18 PM, 'Klaus Aehlig' via ganeti-devel wrote:
Please disregard that; merged the added unit tests incorrectly.
....and here the correct merge.
commit 1478e4f367ac4290e31ab505c680f1653442c23e
Merge: dbe4681 51620a2
Author: Klaus Aehlig <[email protected]>
Date: Thu Dec 4 16:13:55 2014 +0100
Merge branch 'stable-2.13' into master
* stable-2.13
kvm: Delegate socket handling to monitor module
kvm: Use vhostfds obtained by OpenTap
hotplug: Retry VerifyHotplugCommand up to 5 times
Update hotplug design doc
qa: Re-enable NIC hotplug tests
qmp: Log qmp commands and responses
hotplug: Is not supported for QEMU < 1.7
hotplug: Remove unused code after refacoring
hotplug: Use QMP during HotDelDevice
hotplug: Use QMP during HotAddDevice
kvm: Use the new interface during instance start
monitor: Extend HotAddNic() for advanced features
kvm: Refactor _GetNetworkDeviceFeatures() helper
netdev: Refactor OpenTap for future use
hotplug: Use QMP in VerifyHotplugCommand
hotplug: Use QMP in VerifyHotplugSupport
monitor: Close socket fd if already connected
kvm: New _with_qmp decorator
qmp: Add Disk hotplugging related method
qmp: Add NIC hotplugging related methods
qmp: Helper methods for parsing query-pci outpu
qmp: Add helper methods to verify hotplug support
qmp: Add GetFd() wrapper around getfd command
qmp: Refactor of add-fd and remove-fd commands
utils: Introduce GetFreeSlot() function
kvm: Minor refactor of MonitorSocket
* stable-2.12
Check disk size ipolicy during "gnt-instance grow-disk"
Test function ComputeIPolicyDiskSizesViolation
Add a helper function for checking the disk size ipolicy
Add "ignore-ipolicy" option to gnt-instance grow-disk
Fix the installation instructions for the DRBD module
Update install docs - DRBD module parameters
* stable-2.11
(no changes)
* stable-2.10
Fix hlint warnings found by hlint 1.9.11
Only check header for non-generated files
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc lib/cmdlib/instance_storage.py
index 865b241,6251c7e..7cf9510
--- a/lib/cmdlib/instance_storage.py
+++ b/lib/cmdlib/instance_storage.py
@@@ -1729,9 -1707,11 +1730,11 @@@ class LUInstanceGrowDisk(LogicalUnit)
self._CheckDiskSpace(node_uuids, self.disk.ComputeGrowth(self.delta))
+ self._CheckIPolicy(self.target)
+
def _CheckDiskSpace(self, node_uuids, req_vgspace):
- template = self.instance.disk_template
- if (template not in (constants.DTS_NO_FREE_SPACE_CHECK) and
+ template = self.disk.dev_type
+ if (template not in constants.DTS_NO_FREE_SPACE_CHECK and
not any(self.node_es_flags.values())):
# TODO: check the free disk space for file, when that feature will be
# supported
LGTM
--
Niklas Hambüchen
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
