From 241916b5da33bac543be178a98d30d62fc2929a1 Mon Sep 17 00:00:00 2001 From: huijunwu Date: Tue, 25 Apr 2017 01:34:20 -0700 Subject: [PATCH 1/2] fix flaky integration test MultiSpoutsMultiTasks --- .../heron/integration_test/core/IntegrationTestBolt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/src/java/com/twitter/heron/integration_test/core/IntegrationTestBolt.java b/integration-test/src/java/com/twitter/heron/integration_test/core/IntegrationTestBolt.java index f3a8320f9d1..dfaa0340b38 100644 --- a/integration-test/src/java/com/twitter/heron/integration_test/core/IntegrationTestBolt.java +++ b/integration-test/src/java/com/twitter/heron/integration_test/core/IntegrationTestBolt.java @@ -81,7 +81,6 @@ private int calculateTerminalsToReceive(TopologyContext context) { @Override public void execute(Tuple tuple) { - tuplesReceived++; String streamID = tuple.getSourceStreamId(); LOG.info("Received a tuple: " + tuple + " ; from: " + streamID); @@ -105,6 +104,7 @@ public void execute(Tuple tuple) { "Received a terminal, need to receive %s more", terminalsToReceive)); } } else { + tuplesReceived++; currentTupleProcessing = tuple; delegateBolt.execute(tuple); // We ack only the tuples in user's logic From d21db0f8de05a12b0ed5e8fae9aae081d9feacaa Mon Sep 17 00:00:00 2001 From: huijunwu Date: Tue, 25 Apr 2017 01:40:34 -0700 Subject: [PATCH 2/2] re-enable IntegrationTest_MultiSpoutsMultiTasks --- integration-test/src/python/test_runner/resources/test.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/integration-test/src/python/test_runner/resources/test.json b/integration-test/src/python/test_runner/resources/test.json index 7d7d273b384..021d91fce85 100644 --- a/integration-test/src/python/test_runner/resources/test.json +++ b/integration-test/src/python/test_runner/resources/test.json @@ -57,6 +57,11 @@ "classPath" : "bolt_double_emit_tuples.BoltDoubleEmitTuples", "expectedResultRelativePath" : "bolt_double_emit_tuples/resources/BoltDoubleEmitTuples.json" }, + { + "topologyName" : "IntegrationTest_MultiSpoutsMultiTasks", + "classPath" : "multi_spouts_multi_tasks.MultiSpoutsMultiTasks", + "expectedResultRelativePath" : "multi_spouts_multi_tasks/resources/MultiSpoutsMultiTasks.json" + }, { "topologyName" : "IntegrationTest_OneBoltMultiTasks", "classPath" : "one_bolt_multi_tasks.OneBoltMultiTasks",