raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

=clut #24311 timer event may arrive after we already identified successfuly (#24442)

Browse source 
* =clut #24311 timer event may arrive after we already identified successfuly

* mark as NoSerializationVerificationNeeded
This commit is contained in:
Konrad `ktoso` Malawski 2018-01-30 18:17:01 +09:00 • committed by GitHub
parent 78b5045165
commit c7f842942d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala
View file

@ -123,7 +123,7 @@ object ClusterSingletonProxy {
def props(singletonManagerPath: String, settings: ClusterSingletonProxySettings): Props =
Props(new ClusterSingletonProxy(singletonManagerPath, settings)).withDeploy(Deploy.local)
private case object TryToIdentifySingleton
private case object TryToIdentifySingleton extends NoSerializationVerificationNeeded
}
@ -172,7 +172,7 @@ final class ClusterSingletonProxy(singletonManagerPath: String, settings: Cluste
cluster.unsubscribe(self)
}
def cancelTimer() = {
def cancelTimer(): Unit = {
identifyTimer.foreach(_.cancel())
identifyTimer = None
}
@ -261,15 +261,19 @@ final class ClusterSingletonProxy(singletonManagerPath: String, settings: Cluste
cancelTimer()
sendBuffered()
case _: ActorIdentity ⇒ // do nothing
case ClusterSingletonProxy.TryToIdentifySingleton if identifyTimer.isDefined ⇒
membersByAge.headOption.foreach {
oldest ⇒
val singletonAddress = RootActorPath(oldest.address) / singletonPath
log.debug("Trying to identify singleton at [{}]", singletonAddress)
context.actorSelection(singletonAddress) ! Identify(identifyId)
case ClusterSingletonProxy.TryToIdentifySingleton ⇒
identifyTimer match {
case Some(_) ⇒
membersByAge.headOption foreach { oldest ⇒
val singletonAddress = RootActorPath(oldest.address) / singletonPath
log.debug("Trying to identify singleton at [{}]", singletonAddress)
context.actorSelection(singletonAddress) ! Identify(identifyId)
}
case _ ⇒
// ignore, if the timer is not present it means we have successfully identified
}
case Terminated(ref) ⇒
if (singleton.exists(_ == ref)) {
if (singleton.contains(ref)) {
// buffering mode, identification of new will start when old node is removed
singleton = None
}