From 60fd69aadfac2414ef3117dadaf1ae3d61f65c57 Mon Sep 17 00:00:00 2001
From: Till <till.rohrmann@gmail.com>
Date: Tue, 17 Oct 2017 13:39:07 +0200
Subject: [PATCH] [FLINK-7861] [flip6] Suppress ActorKilledException logging

Introduce a StoppingSupervisorWithoutLoggingStrategy which only logs the
ActorKilledException on debug level and all other exceptions on error level.
---
 ...utLoggingActorKilledExceptionStrategy.java | 53 +++++++++++++++++++
 .../apache/flink/runtime/akka/AkkaUtils.scala |  5 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/akka/StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy.java

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy.java
new file mode 100644
index 0000000000000..e2d8fd6089fb8
--- /dev/null
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy.java
@@ -0,0 +1,53 @@
+/*
+ * 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.runtime.akka;
+
+import akka.actor.ActorKilledException;
+import akka.actor.OneForOneStrategy;
+import akka.actor.SupervisorStrategy;
+import akka.actor.SupervisorStrategyConfigurator;
+import akka.japi.pf.PFBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Stopping supervisor strategy which logs {@link ActorKilledException} only on debug log level.
+ */
+public class StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy implements SupervisorStrategyConfigurator {
+
+	private static final Logger LOG = LoggerFactory.getLogger(StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy.class);
+
+	@Override
+	public SupervisorStrategy create() {
+		return new OneForOneStrategy(
+			false,
+			new PFBuilder<Throwable, SupervisorStrategy.Directive>()
+				.match(
+					Exception.class,
+					(Exception e) -> {
+						if (e instanceof ActorKilledException) {
+							LOG.debug("Actor was killed. Stopping it now.", e);
+						} else {
+							LOG.error("Actor failed with exception. Stopping it now.", e);
+						}
+						return SupervisorStrategy.Stop$.MODULE$;
+					})
+				.build());
+	}
+}
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala
index c70836215b837..49c9a8bca499d 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala
@@ -200,6 +200,9 @@ object AkkaUtils {
 
     val logLevel = getLogLevel
 
+    val supervisorStrategy = classOf[StoppingSupervisorWithoutLoggingActorKilledExceptionStrategy]
+      .getCanonicalName
+
     val config =
       s"""
         |akka {
@@ -220,7 +223,7 @@ object AkkaUtils {
         | log-dead-letters-during-shutdown = $logLifecycleEvents
         |
         | actor {
-        |   guardian-supervisor-strategy = "akka.actor.StoppingSupervisorStrategy"
+        |   guardian-supervisor-strategy = $supervisorStrategy
         |   default-dispatcher {
         |     throughput = $akkaThroughput
         |