etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor unused code in storagePoolHasEnoughIops method

This commit is contained in:
ynojima 2014-06-17 11:03:08 -06:00
parent 70a114c3a8
commit 5be7fa23b4
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -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();
}