Remove internal alert definition by name cache used for recovery aler…

…t lookups. Instead query the resource in question for the definition by that name. This fixes problems where a sync file may have many problem/recoveries and may not be in order. [HHQ-2973]
hyperic · Jun 12, 2009 · c00ce09 · c00ce09
1 parent b4cbd70
commit c00ce09
Showing 1 changed file with 15 additions and 25 deletions.
diff --git a/hqu/hqapi1/app/AlertdefinitionController.groovy b/hqu/hqapi1/app/AlertdefinitionController.groovy
@@ -297,7 +297,7 @@ public class AlertdefinitionController extends ApiController {
 
     def sync(params) {
         def syncRequest = new XmlParser().parseText(getUpload('postdata'))
-        def definitionsByName = [:]
+        def definitions = []
 
         for (xmlDef in syncRequest['AlertDefinition']) {
             def failureXml = null
@@ -610,33 +610,23 @@ public class AlertdefinitionController extends ApiController {
                             break
                         }
 
-                        def recoveryDef = definitionsByName[xmlCond.'@recover']
+                        // If a resource alert, look up alert by name
-                        if (recoveryDef) {
+                        if (resource) {
-                            if (aeid.type == recoveryDef.appdefType &&
+                            log.debug("Looking up alerts for resource=" + resource.id)
-                                aeid.id == recoveryDef.appdefId) {
+                            def resourceDefs = resource.getAlertDefinitions(user)
-                                acv.measurementId = recoveryDef.id
+                            def recovery = resourceDefs.find { it.name == xmlCond.'@recover' }
-                            }
+                            if (recovery) {
-                        } else {
+                                log.info("Found recovery definition " + recovery.id)
-                            // Attempt to look for the name of alert on the
+                                acv.measurementId = recovery.id
-                            // given resource.
+                                break
-                            if (resource) {
-                                log.warn("Recovery alert " +
-                                         xmlCond.'@recover' + " not found " +
-                                         "in sync XML, checking resource.")
-                                def resourceDefs = resource.getAlertDefinitions(user)
-                                def recovery = resourceDefs.find { it.name == xmlCond.'@recover' }
-                                if (recovery) {
-                                    log.info("Found definition " + recovery.id)
-                                    acv.measurementId = recovery.id
-                                    break
-                                }
                             }
+                        }
 
+                        if (!acv.measurementId) {
                             failureXml = getFailureXML(ErrorCode.OBJECT_NOT_FOUND,
                                                        "Unable to find recovery " +
                                                        "with name '" +
                                                        xmlCond.'@recover' + "'")
-                            break
                         }
 
                         break
@@ -738,14 +728,14 @@ public class AlertdefinitionController extends ApiController {
                 pojo.unsetEscalation(user)
             }
 
-            // Keep defs around so we don't need to look up recovery alerts            
+            // Keep synced defintions for sync return XML
-            definitionsByName[pojo.name] = pojo
+            definitions << pojo
         }
 
         renderXml() {
             out << AlertDefinitionsResponse() {
                 out << getSuccessXML()
-                for (alertdef in definitionsByName.values()) {
+                for (alertdef in definitions) {
                     out << getAlertDefinitionXML(alertdef, false)
                 }
             }