You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/06/13 07:52:17 UTC
[2/6] flink git commit: [FLINK-9463][runtime] Fix support for epoll
transport type in netty
[FLINK-9463][runtime] Fix support for epoll transport type in netty
For more information please check https://github.com/apache/flink-shaded/issues/30
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8581f575
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8581f575
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8581f575
Branch: refs/heads/master
Commit: 8581f5758595794e823474a1ac2300d543c3b566
Parents: 8169cf4
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Tue May 29 08:40:50 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Jun 13 09:51:44 2018 +0200
----------------------------------------------------------------------
.../org/apache/flink/util/ExceptionUtils.java | 2 +-
.../flink/test/runtime/NettyEpollITCase.java | 94 ++++++++++++++++++++
2 files changed, 95 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8581f575/flink-core/src/main/java/org/apache/flink/util/ExceptionUtils.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/util/ExceptionUtils.java b/flink-core/src/main/java/org/apache/flink/util/ExceptionUtils.java
index 459648f..601a252 100644
--- a/flink-core/src/main/java/org/apache/flink/util/ExceptionUtils.java
+++ b/flink-core/src/main/java/org/apache/flink/util/ExceptionUtils.java
@@ -364,7 +364,7 @@ public final class ExceptionUtils {
Throwable t = throwable;
while (t != null) {
- if (t.getMessage().contains(searchMessage)) {
+ if (t.getMessage() != null && t.getMessage().contains(searchMessage)) {
return Optional.of(t);
} else {
t = t.getCause();
http://git-wip-us.apache.org/repos/asf/flink/blob/8581f575/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
new file mode 100644
index 0000000..e8914ec
--- /dev/null
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.test.runtime;
+
+import org.apache.flink.api.java.functions.KeySelector;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.streaming.api.datastream.DataStream;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.test.util.MiniClusterResource;
+import org.apache.flink.test.util.MiniClusterResource.MiniClusterResourceConfiguration;
+import org.apache.flink.util.TestLogger;
+
+import org.junit.AssumptionViolatedException;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.flink.runtime.io.network.netty.NettyConfig.TRANSPORT_TYPE;
+import static org.apache.flink.util.ExceptionUtils.findThrowableWithMessage;
+
+/**
+ * Test network stack with taskmanager.network.netty.transport set to epoll. This test can only run
+ * on linux. On other platforms it's basically a NO-OP. See
+ * https://github.com/apache/flink-shaded/issues/30
+ */
+public class NettyEpollITCase extends TestLogger {
+
+ private static final Logger LOG = LoggerFactory.getLogger(NettyEpollITCase.class);
+
+ private static final int NUM_TASK_MANAGERS = 2;
+
+ @Test
+ public void testNettyEpoll() throws Exception {
+ MiniClusterResource cluster = trySetUpCluster();
+ try {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setParallelism(NUM_TASK_MANAGERS);
+ env.getConfig().disableSysoutLogging();
+
+ DataStream<Integer> input = env.fromElements(1, 2, 3, 4, 1, 2, 3, 42);
+ input.keyBy(new KeySelector<Integer, Integer>() {
+ @Override
+ public Integer getKey(Integer value) throws Exception {
+ return value;
+ }
+ })
+ .sum(0)
+ .print();
+
+ env.execute();
+ }
+ finally {
+ cluster.after();
+ }
+ }
+
+ private MiniClusterResource trySetUpCluster() throws Exception {
+ try {
+ Configuration config = new Configuration();
+ config.setString(TRANSPORT_TYPE, "epoll");
+ MiniClusterResource cluster = new MiniClusterResource(
+ new MiniClusterResourceConfiguration(
+ config,
+ NUM_TASK_MANAGERS,
+ 1),
+ true);
+ cluster.before();
+ return cluster;
+ }
+ catch (UnsatisfiedLinkError ex) {
+ // If we failed to init netty because we are not on Linux platform, abort the test.
+ if (findThrowableWithMessage(ex, "Only supported on Linux").isPresent()) {
+ throw new AssumptionViolatedException("This test is only supported on linux");
+ }
+ throw ex;
+ }
+ }
+}