Bug 13420: Send alert of type 18 when sending alert for SSVM

kishan · kishan · commit 278833eb2985 · 2012-02-08T18:50:42.000+05:30
Status 13420: resolved fixed
Reviewed-By: Nitin
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -734,7 +734,8 @@ public void sendAlert(short alertType, long dataCenterId, Long podId, Long clust
             if ((alertType != AlertManager.ALERT_TYPE_HOST) &&
                 (alertType != AlertManager.ALERT_TYPE_USERVM) &&
                 (alertType != AlertManager.ALERT_TYPE_DOMAIN_ROUTER) &&
-                (alertType != AlertManager.ALERT_TYPE_CONSOLE_PROXY) &&
+                (alertType != AlertManager.ALERT_TYPE_CONSOLE_PROXY) &&
+                (alertType != AlertManager.ALERT_TYPE_SSVM) &&
                 (alertType != AlertManager.ALERT_TYPE_STORAGE_MISC) &&
                 (alertType != AlertManager.ALERT_TYPE_MANAGMENT_NODE)) {
                 alert = _alertDao.getLastAlert(alertType, dataCenterId, podId, clusterId);
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -299,6 +299,8 @@ public void scheduleRestart(VMInstanceVO vm, boolean investigate) {
                 alertType = AlertManager.ALERT_TYPE_DOMAIN_ROUTER;
             } else if (VirtualMachine.Type.ConsoleProxy.equals(vm.getType())) {
                 alertType = AlertManager.ALERT_TYPE_CONSOLE_PROXY;
+            } else if (VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())) {
+                alertType = AlertManager.ALERT_TYPE_SSVM;
             }
 
             if (!(_forceHA || vm.isHaEnabled())) {
@@ -388,6 +390,8 @@ protected Long restart(HaWorkVO work) {
             alertType = AlertManager.ALERT_TYPE_DOMAIN_ROUTER;
         } else if (VirtualMachine.Type.ConsoleProxy.equals(vm.getType())) {
             alertType = AlertManager.ALERT_TYPE_CONSOLE_PROXY;
+        } else if (VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())) {
+            alertType = AlertManager.ALERT_TYPE_SSVM;
         }
 
         HostVO host = _hostDao.findById(work.getHostId());
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1890,6 +1890,8 @@ protected Command compareState(long hostId, VMInstanceVO vm, final AgentVmInfo i
                 alertType = AlertManager.ALERT_TYPE_DOMAIN_ROUTER;
             } else if (VirtualMachine.Type.ConsoleProxy.equals(vm.getType())) {
                 alertType = AlertManager.ALERT_TYPE_CONSOLE_PROXY;
+            } else if (VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())) {
+                alertType = AlertManager.ALERT_TYPE_SSVM;
             }
 
             HostPodVO podVO = _podDao.findById(vm.getPodIdToDeployIn());
diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
@@ -208,6 +208,7 @@ public void sendAlert(short alertType, long dataCenterId, Long podId, String sub
                 (alertType != AlertManager.ALERT_TYPE_USERVM) &&
                 (alertType != AlertManager.ALERT_TYPE_DOMAIN_ROUTER) &&
                 (alertType != AlertManager.ALERT_TYPE_CONSOLE_PROXY) &&
+                (alertType != AlertManager.ALERT_TYPE_SSVM) &&                
                 (alertType != AlertManager.ALERT_TYPE_STORAGE_MISC) &&
                 (alertType != AlertManager.ALERT_TYPE_MANAGMENT_NODE)) {
                 alert = _alertDao.getLastAlert(alertType, dataCenterId, podId);

Original file line number	Diff line number	Diff line change
`@@ -1890,6 +1890,8 @@ protected Command compareState(long hostId, VMInstanceVO vm, final AgentVmInfo i`
`1890`	`1890`	`alertType = AlertManager.ALERT_TYPE_DOMAIN_ROUTER;`
`1891`	`1891`	`} else if (VirtualMachine.Type.ConsoleProxy.equals(vm.getType())) {`
`1892`	`1892`	`alertType = AlertManager.ALERT_TYPE_CONSOLE_PROXY;`
	`1893`	`+ } else if (VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())) {`
	`1894`	`+ alertType = AlertManager.ALERT_TYPE_SSVM;`
`1893`	`1895`	`}`
`1894`	`1896`
`1895`	`1897`	`HostPodVO podVO = _podDao.findById(vm.getPodIdToDeployIn());`