From 5be7fa23b48b0b06e1f99f015db58523aec87267 Mon Sep 17 00:00:00 2001 From: ynojima Date: Tue, 17 Jun 2014 11:03:08 -0600 Subject: [PATCH] refactor unused code in storagePoolHasEnoughIops method --- server/src/com/cloud/storage/StorageManagerImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 3d8b2c1fb54..de4ad4b2c44 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(); }