From 8d92d00c87b34eea77119dda64f9870b1e078a6c Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Tue, 29 Apr 2014 09:59:33 +0530 Subject: [PATCH] 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 --- .../com/cloud/agent/manager/MockStorageManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 f821dc8fa87..69d4baccd86 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);