Repository: cloudstack Updated Branches: refs/heads/master 70a114c3a -> 5be7fa23b
refactor unused code in storagePoolHasEnoughIops method Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5be7fa23 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5be7fa23 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5be7fa23 Branch: refs/heads/master Commit: 5be7fa23b48b0b06e1f99f015db58523aec87267 Parents: 70a114c Author: ynojima <[email protected]> Authored: Tue Jun 17 11:03:08 2014 -0600 Committer: ynojima <[email protected]> Committed: Tue Jun 17 14:48:57 2014 -0600 ---------------------------------------------------------------------- server/src/com/cloud/storage/StorageManagerImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5be7fa23/server/src/com/cloud/storage/StorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 3d8b2c1..de4ad4b 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1504,9 +1504,10 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C return false; } - // Only SolidFire-type primary storage is using/setting IOPS. + // Only IOPS guaranteed primary storage like SolidFire is using/setting IOPS. // This check returns true for storage that does not specify IOPS. if (pool.getCapacityIops() == null ) { + s_logger.info("Storage pool " + pool.getName() + " (" + pool.getId() + ") does not supply Iops capacity, assuming enough capacity"); return true; } @@ -1533,12 +1534,6 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C long futureIops = currentIops + requestedIops; - // getCapacityIops returns a Long so we need to check for null - if (pool.getCapacityIops() == null) { - s_logger.warn("Storage pool " + pool.getName() + " (" + pool.getId() + ") does not supply Iops capacity, assuming enough capacity"); - return true; - } - return futureIops <= pool.getCapacityIops(); }
