openstack/monasca-thresh
Code Issues Proposed changes

Treat match-by of null as []

Browse Source 
The API sometimes sends null for match-by when it should send []. Make the
Threshold Engine more tolerant by treating null as []

Change-Id: Idf29e58c27a2c0ba531d041a144e8c5f35b6be46
This commit is contained in:
Craig Bryant 2016-01-25 16:06:45 -07:00
parent 0ad583c832
commit 6f3286bc0e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBolt.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 Hewlett-Packard Development Company, L.P. * Copyright (c) 2014-2016 Hewlett-Packard Development Company, L.P.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -46,6 +46,7 @@ import monasca.thresh.infrastructure.persistence.PersistenceModule;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
@ -175,11 +176,19 @@ public class AlarmCreationBolt extends BaseRichBolt {
alarmDefinition.setActionsEnabled(event.alarmActionsEnabled); alarmDefinition.setActionsEnabled(event.alarmActionsEnabled);
alarmDefinition.setExpression(event.alarmExpression); alarmDefinition.setExpression(event.alarmExpression);
alarmDefinition.setSeverity(event.severity); alarmDefinition.setSeverity(event.severity);
if (!alarmDefinition.getMatchBy().equals(event.matchBy)) { final List<String> newMatchBy;
logger.error("AlarmDefinition {}: match-by changed, was {} now {}", if (event.matchBy == null) {
event.alarmDefinitionId, alarmDefinition.getMatchBy(), event.matchBy); // The API can send NULL which means empty list
newMatchBy = new ArrayList<>(0);
} }
alarmDefinition.setMatchBy(event.matchBy); // Should never change else {
newMatchBy = event.matchBy;
}
if (!alarmDefinition.getMatchBy().equals(newMatchBy)) {
logger.error("AlarmDefinition {}: match-by changed, was {} now {}",
event.alarmDefinitionId, alarmDefinition.getMatchBy(), newMatchBy);
}
alarmDefinition.setMatchBy(newMatchBy); // Should never change
for (Map.Entry<String, AlarmSubExpression> entry : event.changedSubExpressions.entrySet()) { for (Map.Entry<String, AlarmSubExpression> entry : event.changedSubExpressions.entrySet()) {
if (!alarmDefinition.updateSubExpression(entry.getKey(), entry.getValue())) { if (!alarmDefinition.updateSubExpression(entry.getKey(), entry.getValue())) {
logger.error("AlarmDefinition {}: Did not finding matching SubAlarmExpression id={} SubAlarmExpression{}", logger.error("AlarmDefinition {}: Did not finding matching SubAlarmExpression id={} SubAlarmExpression{}",