Repository: cloudstack Updated Branches: refs/heads/master cbf0a559a -> 8d92d00c8
CLOUDSTACK-4371: [Performance Testing] Basic zone with 20K Hosts, management server restart leaves the hosts in disconnected state for very long time Fixed simulator code to handle local storage during host reconnect Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d92d00c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d92d00c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d92d00c Branch: refs/heads/master Commit: 8d92d00c87b34eea77119dda64f9870b1e078a6c Parents: cbf0a55 Author: Koushik Das <[email protected]> Authored: Tue Apr 29 09:59:33 2014 +0530 Committer: Koushik Das <[email protected]> Committed: Tue Apr 29 11:11:25 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d92d00c/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 f821dc8..69d4bac 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -335,7 +335,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa if (storagePool == null) { storagePool = new MockStoragePoolVO(); storagePool.setUuid(sf.getUuid()); - storagePool.setMountPoint("/mnt/" + sf.getUuid() + File.separator); + storagePool.setMountPoint("/mnt/" + sf.getUuid()); Long size = DEFAULT_HOST_STORAGE_SIZE; String path = sf.getPath(); @@ -376,7 +376,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa if (storagePool == null) { storagePool = new MockStoragePoolVO(); storagePool.setUuid(sf.getUuid()); - storagePool.setMountPoint("/mnt/" + sf.getUuid() + File.separator); + storagePool.setMountPoint("/mnt/" + sf.getUuid()); Long size = DEFAULT_HOST_STORAGE_SIZE; String path = sf.getPath(); @@ -945,7 +945,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa String uuid = UUID.randomUUID().toString(); storagePool = new MockStoragePoolVO(); storagePool.setUuid(uuid); - storagePool.setMountPoint("/mnt/" + uuid + File.separator); + storagePool.setMountPoint("/mnt/" + uuid); storagePool.setCapacity(DEFAULT_HOST_STORAGE_SIZE); storagePool.setHostGuid(hostGuid); storagePool.setStorageType(StoragePoolType.Filesystem); @@ -1004,7 +1004,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa String uuid = UUID.randomUUID().toString(); storagePool = new MockStoragePoolVO(); storagePool.setUuid(uuid); - storagePool.setMountPoint("/mnt/" + uuid + File.separator); + storagePool.setMountPoint("/mnt/" + uuid); storagePool.setCapacity(storageSize); storagePool.setHostGuid(hostGuid); storagePool.setStorageType(StoragePoolType.Filesystem);
