You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by kk...@apache.org on 2018/03/01 09:45:52 UTC

flink git commit: [FLINK-4387][QS] don't wait and process requests at Netty servers after shutdown request

Repository: flink
Updated Branches:
  refs/heads/master 45397fe97 -> 6ad626ae5


[FLINK-4387][QS] don't wait and process requests at Netty servers after shutdown request

There is a race condition on an assertion in Netty's event loop that may cause
tests to fail when finished early.

This was fixed in 4.0.33.Final, see https://github.com/netty/netty/issues/4357.

This closes #5606.


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

Branch: refs/heads/master
Commit: 6ad626ae51a157306ddf4165f13ff5eb5b4d5e8b
Parents: 45397fe
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Thu Mar 1 09:43:56 2018 +0100
Committer: kkloudas <kk...@gmail.com>
Committed: Thu Mar 1 10:44:33 2018 +0100

----------------------------------------------------------------------
 .../org/apache/flink/queryablestate/network/ClientTest.java    | 3 ++-
 .../apache/flink/queryablestate/network/KvStateServerTest.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/6ad626ae/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/ClientTest.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/ClientTest.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/ClientTest.java
index 8638efa..6aa4710 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/ClientTest.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/ClientTest.java
@@ -111,7 +111,8 @@ public class ClientTest {
 	@After
 	public void tearDown() throws Exception {
 		if (nioGroup != null) {
-			nioGroup.shutdownGracefully();
+			// note: no "quiet period" to not trigger Netty#4357
+			nioGroup.shutdownGracefully(0, 10, TimeUnit.SECONDS);
 		}
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/6ad626ae/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerTest.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerTest.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerTest.java
index 8af9cf5..79c23ad 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerTest.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerTest.java
@@ -79,7 +79,8 @@ public class KvStateServerTest {
 	@AfterClass
 	public static void tearDown() throws Exception {
 		if (NIO_GROUP != null) {
-			NIO_GROUP.shutdownGracefully();
+			// note: no "quiet period" to not trigger Netty#4357
+			NIO_GROUP.shutdownGracefully(0, 10, TimeUnit.SECONDS);
 		}
 	}
 
@@ -191,7 +192,8 @@ public class KvStateServerTest {
 			if (bootstrap != null) {
 				EventLoopGroup group = bootstrap.group();
 				if (group != null) {
-					group.shutdownGracefully();
+					// note: no "quiet period" to not trigger Netty#4357
+					group.shutdownGracefully(0, 10, TimeUnit.SECONDS);
 				}
 			}
 		}