You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2015/06/05 17:50:57 UTC

flink git commit: [FLINK-2002] [streaming] Test for iterations being gracefully shut down

Repository: flink
Updated Branches:
  refs/heads/master 9b8818451 -> 3e6b6beab


[FLINK-2002] [streaming] Test for iterations being gracefully shut down

The fix was done by gyfora in fdac963.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3e6b6bea
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3e6b6bea
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3e6b6bea

Branch: refs/heads/master
Commit: 3e6b6beab360b5961cdb2b6d0887f5a31634aa23
Parents: 9b88184
Author: mbalassi <mb...@apache.org>
Authored: Fri Jun 5 11:15:53 2015 +0200
Committer: mbalassi <mb...@apache.org>
Committed: Fri Jun 5 17:50:28 2015 +0200

----------------------------------------------------------------------
 .../flink/streaming/api/complex/ComplexIntegrationTest.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/3e6b6bea/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/complex/ComplexIntegrationTest.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/complex/ComplexIntegrationTest.java b/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/complex/ComplexIntegrationTest.java
index 809668d..421d4ac 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/complex/ComplexIntegrationTest.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/complex/ComplexIntegrationTest.java
@@ -114,8 +114,7 @@ public class ComplexIntegrationTest extends StreamingMultipleProgramsTestBase {
 		//i == 18
 		expected2 += "(20,(a,1))";
 
-		//We create a separate environment for this test because of the slot-related to iteration issues.
-		StreamExecutionEnvironment env = new TestStreamEnvironment(4, 32); //StreamExecutionEnvironment.getExecutionEnvironment();
+		StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
 		DataStream<Tuple2<Long, Tuple2<String, Long>>> sourceStream1 = env.addSource(new TupleSource()).setParallelism(1);
 
 		IterativeDataStream<Tuple2<Long, Tuple2<String, Long>>> it = sourceStream1.sum(0).setParallelism(1).filter(new FilterFunction