You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/05/06 17:08:29 UTC
git commit: updated refs/heads/master to c9a09f5
Repository: cloudstack
Updated Branches:
refs/heads/master 59bf35591 -> c9a09f548
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c9a09f54
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9a09f54
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9a09f54
Branch: refs/heads/master
Commit: c9a09f548c0630fa17a9d24cc538b93f757bb3cd
Parents: 59bf355
Author: Koushik Das <ko...@apache.org>
Authored: Tue May 6 20:24:08 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Tue May 6 20:27:41 2014 +0530
----------------------------------------------------------------------
.../storage/datastore/provider/DefaultHostListener.java | 2 +-
.../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9a09f54/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
----------------------------------------------------------------------
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 fffd1e8..e77d548 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9a09f54/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
----------------------------------------------------------------------
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 69d4bac..8e1aaed 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<String, TemplateProp>());
+ return new ModifyStoragePoolAnswer(cmd, storagePool.getCapacity(), storagePool.getCapacity(), new HashMap<String, TemplateProp>());
}
@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