Repository: cloudstack Updated Branches: refs/heads/master 3907bc6f9 -> e87bb20d0
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e87bb20d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e87bb20d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e87bb20d Branch: refs/heads/master Commit: e87bb20d0c73e6f46f1352e271afec3961067542 Parents: 3907bc6 Author: Nitin Mehta <[email protected]> Authored: Fri Nov 14 13:35:40 2014 -0800 Committer: Nitin Mehta <[email protected]> Committed: Fri Nov 14 13:35:40 2014 -0800 ---------------------------------------------------------------------- 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/e87bb20d/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 4ccaa98..65930aa 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -928,6 +928,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/e87bb20d/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 c996c0b..3ba4242 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.
