openstack
/
monasca-thresh
Code Issues Proposed changes

Clone the currentValues property in duplicate method 

It is possible for the currentValues property to change which can cause
java.util.ConcurrentModificationException. Fix by cloning currentValues
before the SubAlarm gets emitted into storm

Change-Id: I555beffafe0208c0d256732517af401938876d3d
This commit is contained in:
Craig Bryant 2016-06-09 14:35:01 -06:00
parent 0e72d867ec
commit d5d14ecdcd
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java
View File

@ -1,5 +1,5 @@
/*
* (C) Copyright 2014,2016 Hewlett Packard Enterprise Development Company LP.
* (C) Copyright 2014-2016 Hewlett Packard Enterprise Development Company LP.
* Copyright 2016 FUJITSU LIMITED
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -41,9 +41,11 @@ import org.apache.storm.tuple.Values;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -235,10 +237,24 @@ public class MetricAggregationBolt extends BaseRichBolt {
new SubAlarm(original.getId(), original.getAlarmId(), new SubExpression(
original.getAlarmSubExpressionId(), original.getExpression()), original.getState());
newSubAlarm.setNoState(original.isNoState());
newSubAlarm.setCurrentValues(original.getCurrentValues());
newSubAlarm.setCurrentValues(cloneCurrentValues(original));
return newSubAlarm;
}
/**
* Shallow clone of the List. Doubles are immutable so no point in doing a deep copy
*
* @param original List<Double>
* @return null if original is null, other shallow clone of original
*/
private List<Double> cloneCurrentValues(final SubAlarm original) {
final List<Double> originalCurrentValues = original.getCurrentValues();
if (originalCurrentValues == null) {
return null;
}
return new ArrayList<Double>(originalCurrentValues);
}
/**
* Only used for testing.
*