From c9a09f548c0630fa17a9d24cc538b93f757bb3cd Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Tue, 6 May 2014 20:24:08 +0530 Subject: [PATCH] CLOUDSTACK-6579: used_bytes column of storage_pool table is no longer used and should be removed For now correctly setting used_bytes. Also fixed the corresponding simulator code --- .../storage/datastore/provider/DefaultHostListener.java | 2 +- .../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java index fffd1e815c4..e77d5489cb6 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java @@ -81,7 +81,7 @@ public class DefaultHostListener implements HypervisorHostListener { } StoragePoolVO poolVO = this.primaryStoreDao.findById(poolId); - poolVO.setUsedBytes(mspAnswer.getPoolInfo().getAvailableBytes()); + poolVO.setUsedBytes(mspAnswer.getPoolInfo().getCapacityBytes() - mspAnswer.getPoolInfo().getAvailableBytes()); poolVO.setCapacityBytes(mspAnswer.getPoolInfo().getCapacityBytes()); primaryStoreDao.update(pool.getId(), poolVO); diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index 69d4baccd86..8e1aaed8470 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -362,7 +362,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB); txn.close(); } - return new ModifyStoragePoolAnswer(cmd, storagePool.getCapacity(), 0, new HashMap()); + return new ModifyStoragePoolAnswer(cmd, storagePool.getCapacity(), storagePool.getCapacity(), new HashMap()); } @Override @@ -964,7 +964,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa } } return new StoragePoolInfo(storagePool.getUuid(), host.getPrivateIpAddress(), storagePool.getMountPoint(), storagePool.getMountPoint(), - storagePool.getPoolType(), storagePool.getCapacity(), 0); + storagePool.getPoolType(), storagePool.getCapacity(), storagePool.getCapacity()); } @Override