Repository: incubator-samoa Updated Branches: refs/heads/master 804eac8c0 -> 6e6bb1817
SAMOA-71: fixes concurrency issues in HorizontalAMRulesRegressor and storm tests Fix #68 Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/6e6bb181 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/6e6bb181 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/6e6bb181 Branch: refs/heads/master Commit: 6e6bb1817927d5610d007606922a473882d593aa Parents: 804eac8 Author: Maciej Grzenda <[email protected]> Authored: Wed Jul 19 15:12:35 2017 +0200 Committer: Gianmarco De Francisci Morales <[email protected]> Committed: Thu Oct 5 15:28:31 2017 +0300 ---------------------------------------------------------------------- bin/samoa-storm.properties | 2 +- .../classifiers/rules/distributed/AMRRuleSetProcessor.java | 7 +++---- samoa-storm/src/test/java/org/apache/samoa/AlgosTest.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6e6bb181/bin/samoa-storm.properties ---------------------------------------------------------------------- diff --git a/bin/samoa-storm.properties b/bin/samoa-storm.properties index 58a395d..e167f31 100644 --- a/bin/samoa-storm.properties +++ b/bin/samoa-storm.properties @@ -34,4 +34,4 @@ samoa.storm.mode=local samoa.storm.numworker=4 # samoa.storm.local.mode.execution.duration corresponds to the execution duration of the local topology in seconds. -samoa.storm.local.mode.execution.duration=200 +samoa.storm.local.mode.execution.duration=400 http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6e6bb181/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/distributed/AMRRuleSetProcessor.java ---------------------------------------------------------------------- diff --git a/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/distributed/AMRRuleSetProcessor.java b/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/distributed/AMRRuleSetProcessor.java index bf43ad0..beb7e40 100644 --- a/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/distributed/AMRRuleSetProcessor.java +++ b/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/distributed/AMRRuleSetProcessor.java @@ -20,8 +20,7 @@ package org.apache.samoa.learners.classifiers.rules.distributed; * #L% */ -import java.util.LinkedList; -import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import org.apache.samoa.core.ContentEvent; import org.apache.samoa.core.Processor; @@ -56,7 +55,7 @@ public class AMRRuleSetProcessor implements Processor { private int processorId; // Rules & default rule - protected transient List<PassiveRule> ruleSet; + protected transient CopyOnWriteArrayList<PassiveRule> ruleSet; // SAMOA Stream private Stream statisticsStream; @@ -251,7 +250,7 @@ public class AMRRuleSetProcessor implements Processor { @Override public void onCreate(int id) { this.processorId = id; - this.ruleSet = new LinkedList<PassiveRule>(); + this.ruleSet = new CopyOnWriteArrayList<PassiveRule>(); } http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6e6bb181/samoa-storm/src/test/java/org/apache/samoa/AlgosTest.java ---------------------------------------------------------------------- diff --git a/samoa-storm/src/test/java/org/apache/samoa/AlgosTest.java b/samoa-storm/src/test/java/org/apache/samoa/AlgosTest.java index 1c18eaf..8520445 100644 --- a/samoa-storm/src/test/java/org/apache/samoa/AlgosTest.java +++ b/samoa-storm/src/test/java/org/apache/samoa/AlgosTest.java @@ -68,7 +68,7 @@ public class AlgosTest { } - @Test(timeout = 120000) + @Test(timeout = 240000) public void testCVPReqVHTWithStorm() throws Exception { TestParams vhtConfig = new TestParams.Builder()
