Skip to content

Log receiving of heartbeats when verbose heartbeat logging is on #25183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johanandren merged 1 commit into from
Jun 4, 2018
Merged

Log receiving of heartbeats when verbose heartbeat logging is on #25183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ private[cluster] final class ClusterHeartbeatReceiver extends Actor with ActorLo

// Important - don't use Cluster(context.system) in constructor because that would
// cause deadlock. See startup sequence in ClusterDaemon.
lazy val selfHeartbeatRsp = HeartbeatRsp(Cluster(context.system).selfUniqueAddress)
lazy val cluster = Cluster(context.system)
lazy val selfHeartbeatRsp = HeartbeatRsp(cluster.selfUniqueAddress)
lazy val verboseHeartbeat = cluster.settings.Debug.VerboseHeartbeatLogging

def receive = {
case Heartbeat(from) ⇒ sender() ! selfHeartbeatRsp
case Heartbeat(from) ⇒
if (verboseHeartbeat) log.debug("Cluster Node [{}] - Heartbeat from [{}]", cluster.selfAddress, from)

@patriknw patriknw Jun 1, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we have "Heartbeat to", "Heartbeat from" and "Heartbeat response from". That's good.

sender() ! selfHeartbeatRsp
}

}
Expand Down
2 changes: 1 addition & 1 deletion akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ private[transport] class ProtocolStateActor(
})
wrappedHandle.disassociate(disassociationReason(reason), log)

case StopEvent(reason, _, AssociatedWaitHandler(handlerFuture, wrappedHandle, queue)) ⇒
case StopEvent(reason, _, AssociatedWaitHandler(handlerFuture, wrappedHandle, _)) ⇒
// Invalidate exposed but still unfinished promise. The underlying association disappeared, so after
// registration immediately signal a disassociate
val disassociateNotification = reason match {
Expand Down