You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/10/08 19:42:32 UTC

[3/3] flink git commit: [FLINK-7739] [kafka connector] Fix test instabilities

[FLINK-7739] [kafka connector] Fix test instabilities

  - Set shorter heartbeats intervals. Default pause value of 60seconds is
    too large (tests would timeout before akka react)

  - Exclude netty dependency from zookeeper. Zookeeper was pulling in
    conflicting Netty version. Conflict was extremly subtle - TaskManager in
    Kafka tests was deadlocking in some rare corner cases.

This closes #4775


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

Branch: refs/heads/release-1.3
Commit: 1651482ae8a8c41066c13da597888173b3280630
Parents: c845ba0
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Fri Sep 29 18:23:29 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Oct 6 19:57:59 2017 +0200

----------------------------------------------------------------------
 .../apache/flink/streaming/connectors/kafka/KafkaTestBase.java | 3 +++
 pom.xml                                                        | 6 ++++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/1651482a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
index 1837af6..d70797e 100644
--- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
+++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
@@ -18,6 +18,7 @@
 package org.apache.flink.streaming.connectors.kafka;
 
 import org.apache.flink.client.program.ProgramInvocationException;
+import org.apache.flink.configuration.AkkaOptions;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.MetricOptions;
@@ -120,6 +121,8 @@ public abstract class KafkaTestBase extends TestLogger {
 
 	protected static Configuration getFlinkConfiguration() {
 		Configuration flinkConfig = new Configuration();
+		flinkConfig.setString(AkkaOptions.WATCH_HEARTBEAT_PAUSE, "5 s");
+		flinkConfig.setString(AkkaOptions.WATCH_HEARTBEAT_INTERVAL, "1 s");
 		flinkConfig.setInteger(ConfigConstants.LOCAL_NUMBER_TASK_MANAGER, NUM_TMS);
 		flinkConfig.setInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, TM_SLOTS);
 		flinkConfig.setLong(TaskManagerOptions.MANAGED_MEMORY_SIZE, 16L);

http://git-wip-us.apache.org/repos/asf/flink/blob/1651482a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91c8cd3..e240e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,6 +436,12 @@ under the License.
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-log4j12</artifactId>
 					</exclusion>
+					<!-- Netty from zookeeper is conflicting with akka's, which can cause occasional deadlock inside
+					Netty threads -->
+					<exclusion>
+						<groupId>io.netty</groupId>
+						<artifactId>netty</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>