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

bug 9221: Parse storage.overprovisioning.factor as a float rather than as an int. 

Status 9221: resolved fixed
This commit is contained in:
nit 2011-04-15 13:46:17 +05:30
parent ce37212610
commit 8567935561
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -290,7 +290,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
protected int _updateWait;
protected int _alertWait;
protected long _nodeId = -1;
protected int _overProvisioningFactor = 1;
protected float _overProvisioningFactor = 1;
protected float _cpuOverProvisioningFactor = 1;
protected Random _rand = new Random(System.currentTimeMillis());
@ -380,7 +380,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
String overProvisioningFactorStr = configs
.get("storage.overprovisioning.factor");
_overProvisioningFactor = NumbersUtil.parseInt(
_overProvisioningFactor = NumbersUtil.parseFloat(
overProvisioningFactorStr, 1);
String cpuOverProvisioningFactorStr = configs
@ -3010,7 +3010,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
if (ssCmd.getResourceType() == Storage.StorageResourceType.STORAGE_HOST) {
CapacityVO capacity = new CapacityVO(server.getId(),
server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L,
server.getTotalSize() * _overProvisioningFactor,
(long)(server.getTotalSize() * _overProvisioningFactor),
CapacityVO.CAPACITY_TYPE_STORAGE_ALLOCATED);
_capacityDao.persist(capacity);
}

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

@ -294,7 +294,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
protected int _retry = 2;
protected int _pingInterval = 60; // seconds
protected int _hostRetry;
protected int _overProvisioningFactor = 1;
protected float _overProvisioningFactor = 1;
private int _maxVolumeSizeInGb;
private long _serverId;
@ -794,7 +794,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
String overProvisioningFactorStr = configs.get("storage.overprovisioning.factor");
if (overProvisioningFactorStr != null) {
_overProvisioningFactor = Integer.parseInt(overProvisioningFactorStr);
_overProvisioningFactor = Float.parseFloat(overProvisioningFactorStr);
}
_retry = NumbersUtil.parseInt(configs.get(Config.StartRetry.key()), 10);
@ -1741,9 +1741,9 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
capacities = _capacityDao.search(capacitySC, null);
int provFactor = 1;
long provFactor = 1;
if (storagePool.getPoolType() == StoragePoolType.NetworkFilesystem) {
provFactor = _overProvisioningFactor;
provFactor = (long) _overProvisioningFactor;
}
if (capacities.size() == 0) {
CapacityVO capacity = new CapacityVO(storagePool.getId(), storagePool.getDataCenterId(), storagePool.getPodId(), storagePool.getClusterId(), allocated, storagePool.getCapacityBytes()

6
server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java Normal file → Executable file
View File

@ -74,7 +74,7 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
@Inject StoragePoolHostDao _poolHostDao;
@Inject ConfigurationDao _configDao;
@Inject ClusterDao _clusterDao;
int _storageOverprovisioningFactor;
float _storageOverprovisioningFactor;
long _extraBytesPerVolume = 0;
Random _rand;
boolean _dontMatter;
@ -87,7 +87,7 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
Map<String, String> configs = _configDao.getConfiguration(null, params);
String globalStorageOverprovisioningFactor = configs.get("storage.overprovisioning.factor");
_storageOverprovisioningFactor = NumbersUtil.parseInt(globalStorageOverprovisioningFactor, 2);
_storageOverprovisioningFactor = NumbersUtil.parseFloat(globalStorageOverprovisioningFactor, 2);
_extraBytesPerVolume = 0;
@ -246,7 +246,7 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
long askingSize = dskCh.getSize();
int storageOverprovisioningFactor = 1;
float storageOverprovisioningFactor = 1;
if (pool.getPoolType() == StoragePoolType.NetworkFilesystem) {
storageOverprovisioningFactor = _storageOverprovisioningFactor;
}