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 2017/10/20 12:38:04 UTC
flink git commit: [FLINK-7861] [flip6] Suppress ActorKilledException
logging
Repository: flink
Updated Branches:
refs/heads/master 06b6c87a6 -> 334970248
[FLINK-7861] [flip6] Suppress ActorKilledException logging
Introduce a StoppingSupervisorWithoutLoggingStrategy which only logs the
ActorKilledException on debug level and all other exceptions on error level.
This closes #4845.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/33497024
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/33497024
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/33497024
Branch: refs/heads/master
Commit: 33497024852c521472c40040cc023526426835af
Parents: 06b6c87
Author: Till <ti...@gmail.com>
Authored: Tue Oct 17 13:39:07 2017 +0200
Committer: Till <ti...@gmail.com>
Committed: Fri Oct 20 14:37:31 2017 +0200
----------------------------------------------------------------------
...houtLoggingActorKilledExceptionStrategy.java | 53 ++++++++++++++++++++
.../apache/flink/runtime/akka/AkkaUtils.scala | 5 +-
2 files changed, 57 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/33497024/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 0000000..e2d8fd6
--- /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());
+ }
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/33497024/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala
----------------------------------------------------------------------
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 952177c..05ffc87 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
|