CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started. (cherry picked from commit e87bb20d0c73e6f46f1352e271afec3961067542) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/665aa6b5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/665aa6b5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/665aa6b5 Branch: refs/heads/4.5 Commit: 665aa6b52289306c3085868d0ec2dfe1837bc13e Parents: a12ab8a Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Fri Nov 14 13:35:40 2014 -0800 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Tue Jan 20 11:55:47 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 1 + .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/665aa6b5/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index a527160..bb64fa3 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -924,6 +924,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy } }catch (Exception e){ errorString = e.getMessage(); + throw e; }finally { // TODO - For now put all the alerts as creation failure. Distinguish between creation vs start failure in future. // Also add failure reason since startvm masks some of them. http://git-wip-us.apache.org/repos/asf/cloudstack/blob/665aa6b5/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java index 9edd600..cc7eb25 100755 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -722,6 +722,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar } }catch (Exception e){ errorString = e.getMessage(); + throw e; }finally{ // TODO - For now put all the alerts as creation failure. Distinguish between creation vs start failure in future. // Also add failure reason since startvm masks some of them.
