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 2015/09/07 17:35:17 UTC
[2/5] flink git commit: [hotfix] [tests] Increase zookeeper session
timeouts in tests them more robust
[hotfix] [tests] Increase zookeeper session timeouts in tests them more robust
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/99105109
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/99105109
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/99105109
Branch: refs/heads/master
Commit: 99105109c681906d3cbc3479fcd7a77ea51fbbc7
Parents: c8c0ec2
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Sep 7 14:43:52 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Sep 7 14:43:52 2015 +0200
----------------------------------------------------------------------
.../flink/streaming/connectors/kafka/KafkaTestBase.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/99105109/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java b/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
index b8afe39..1f44dc2 100644
--- a/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
+++ b/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
@@ -193,7 +193,9 @@ public abstract class KafkaTestBase extends TestLogger {
LOG.info("-------------------------------------------------------------------------");
flinkPort = -1;
- flink.shutdown();
+ if (flink != null) {
+ flink.shutdown();
+ }
for (KafkaServer broker : brokers) {
if (broker != null) {
@@ -253,7 +255,11 @@ public abstract class KafkaTestBase extends TestLogger {
kafkaProperties.put("log.dir", tmpFolder.toString());
kafkaProperties.put("zookeeper.connect", zookeeperConnectionString);
kafkaProperties.put("message.max.bytes", "" + (50 * 1024 * 1024));
- kafkaProperties.put("replica.fetch.max.bytes", "" + (50 * 1024 * 1024));
+ kafkaProperties.put("replica.fetch.max.bytes", String.valueOf(50 * 1024 * 1024));
+
+ // for CI stability, increase zookeeper session timeout
+ kafkaProperties.put("zookeeper.session.timeout.ms", "20000");
+
KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties);
KafkaServer server = new KafkaServer(kafkaConfig, new KafkaLocalSystemTime());