From 90003a62398f6cc73fd12a8ca7a1d7ea4db215ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Mon, 29 Nov 2021 21:55:42 +0100
Subject: [PATCH] warnings instead of errors for artery failures during
 shutdown  (#30943)

Log warnings instead of errors for artery failures during shutdown or that will be retried
---
 .../main/scala/akka/remote/artery/ArteryTransport.scala    | 4 ++--
 .../src/main/scala/akka/remote/artery/Association.scala    | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
index 75232bf51c..53e9b5bdbc 100644
--- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
@@ -584,11 +584,11 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr
       case _: AeronTerminated  => // shutdown already in progress
       case cause if isShutdown =>
         // don't restart after shutdown, but log some details so we notice
-        log.error(cause, s"{} failed after shutdown. {}", streamName, cause.getMessage)
+        log.warning(s"{} failed after shutdown. {}: {}", streamName, cause.getClass.getName, cause.getMessage)
       case _: AbruptTerminationException => // ActorSystem shutdown
       case cause =>
         if (restartCounter.restart()) {
-          log.error(cause, "{} failed. Restarting it. {}", streamName, cause.getMessage)
+          log.warning("{} failed. Restarting it. {}: {}", streamName, cause.getClass.getName, cause.getMessage)
           flightRecorder.transportRestartInbound(localAddress, streamName)
           restart()
         } else {
diff --git a/akka-remote/src/main/scala/akka/remote/artery/Association.scala b/akka-remote/src/main/scala/akka/remote/artery/Association.scala
index 8644b43dac..8406d7f96e 100644
--- a/akka-remote/src/main/scala/akka/remote/artery/Association.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/Association.scala
@@ -972,7 +972,12 @@ private[remote] class Association(
         // don't restart after shutdown, but log some details so we notice
         // for the TCP transport the ShutdownSignal is "converted" to StreamTcpException
         if (!cause.isInstanceOf[StreamTcpException])
-          log.error(cause, s"{} to [{}] failed after shutdown. {}", streamName, remoteAddress, cause.getMessage)
+          log.warning(
+            s"{} to [{}] failed after shutdown. {}: {}",
+            streamName,
+            remoteAddress,
+            cause.getClass.getName,
+            cause.getMessage)
         cancelAllTimers()
         // countDown the latch in case threads are waiting on the latch in outboundControlIngress method
         materializing.countDown()