From 7327906cdf82184613daae05459b4fd706ebd9d3 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 12 Nov 2010 17:19:15 -0800 Subject: [PATCH] the pool availability part is done by the sp allocators, hence commenting out the code in here. --- .../cloud/server/ManagementServerImpl.java | 40 +++++++++---------- .../src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index b24e11ad4cc..d3f60472463 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -4808,29 +4808,29 @@ public class ManagementServerImpl implements ManagementServer { if (systemVm.getType().equals(VirtualMachine.Type.ConsoleProxy)){ long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_PROXY_START, "Starting console proxy with Id: "+id); - try { - checkIfStoragePoolAvailable(id); - } catch (StorageUnavailableException e) { - s_logger.warn(e.getMessage()); - return null; - } catch (Exception e){ - //unforseen exceptions - s_logger.warn(e.getMessage()); - return null; - } +// try { +// checkIfStoragePoolAvailable(id); +// } catch (StorageUnavailableException e) { +// s_logger.warn(e.getMessage()); +// return null; +// } catch (Exception e){ +// //unforseen exceptions +// s_logger.warn(e.getMessage()); +// return null; +// } return startConsoleProxy(id, eventId); } else { long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_SSVM_START, "Starting secondary storage Vm Id: "+id); - try { - checkIfStoragePoolAvailable(id); - } catch (StorageUnavailableException e) { - s_logger.warn(e.getMessage()); - return null; - } catch (Exception e){ - //unforseen exceptions - s_logger.warn(e.getMessage()); - return null; - } +// try { +// checkIfStoragePoolAvailable(id); +// } catch (StorageUnavailableException e) { +// s_logger.warn(e.getMessage()); +// return null; +// } catch (Exception e){ +// //unforseen exceptions +// s_logger.warn(e.getMessage()); +// return null; +// } return startSecondaryStorageVm(id, eventId); } } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 64e10407032..3fa99e48a7b 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -817,7 +817,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM return null; } - checkIfPoolAvailable(vmId);//throws StorageUnavailableException if pool is not UP +// checkIfPoolAvailable(vmId);//throws StorageUnavailableException if pool is not UP EventVO event = new EventVO(); event.setType(EventTypes.EVENT_VM_START);