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

revert rename gotoOldest

Browse source
This commit is contained in:
Patrik Nordwall 2019-03-29 13:18:28 +01:00
parent 95fce88b2d
commit 1c93e31bf7
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
View file

@ -599,7 +599,7 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
oldestChangedReceived = true oldestChangedReceived = true
if (oldestOption == selfUniqueAddressOption && safeToBeOldest) if (oldestOption == selfUniqueAddressOption && safeToBeOldest)
// oldest immediately // oldest immediately
tryGoToOldest() tryGotoOldest()
else if (oldestOption == selfUniqueAddressOption) else if (oldestOption == selfUniqueAddressOption)
goto(BecomingOldest).using(BecomingOldestData(None)) goto(BecomingOldest).using(BecomingOldestData(None))
else else
@ -612,8 +612,8 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
if (oldestOption == selfUniqueAddressOption) { if (oldestOption == selfUniqueAddressOption) {
logInfo("Younger observed OldestChanged: [{} -> myself]", previousOldestOption.map(_.address)) logInfo("Younger observed OldestChanged: [{} -> myself]", previousOldestOption.map(_.address))
previousOldestOption match { previousOldestOption match {
case None => tryGoToOldest() case None => tryGotoOldest()
case Some(prev) if removed.contains(prev) => tryGoToOldest() case Some(prev) if removed.contains(prev) => tryGotoOldest()
case Some(prev) => case Some(prev) =>
peer(prev.address) ! HandOverToMe peer(prev.address) ! HandOverToMe
goto(BecomingOldest).using(BecomingOldestData(previousOldestOption)) goto(BecomingOldest).using(BecomingOldestData(previousOldestOption))
@ -662,7 +662,7 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
case Event(HandOverDone, BecomingOldestData(Some(previousOldest))) => case Event(HandOverDone, BecomingOldestData(Some(previousOldest))) =>
if (sender().path.address == previousOldest.address) if (sender().path.address == previousOldest.address)
tryGoToOldest() tryGotoOldest()
else { else {
logInfo( logInfo(
"Ignoring HandOverDone in BecomingOldest from [{}]. Expected previous oldest [{}]", "Ignoring HandOverDone in BecomingOldest from [{}]. Expected previous oldest [{}]",
@ -687,7 +687,7 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
if m.uniqueAddress == previousOldest => if m.uniqueAddress == previousOldest =>
logInfo("Previous oldest [{}] removed", previousOldest.address) logInfo("Previous oldest [{}] removed", previousOldest.address)
addRemoved(m.uniqueAddress) addRemoved(m.uniqueAddress)
tryGoToOldest() tryGotoOldest()
case Event(TakeOverFromMe, BecomingOldestData(previousOldestOption)) => case Event(TakeOverFromMe, BecomingOldestData(previousOldestOption)) =>
val senderAddress = sender().path.address val senderAddress = sender().path.address
@ -724,7 +724,7 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
// can't send HandOverToMe, previousOldest unknown for new node (or restart) // can't send HandOverToMe, previousOldest unknown for new node (or restart)
// previous oldest might be down or removed, so no TakeOverFromMe message is received // previous oldest might be down or removed, so no TakeOverFromMe message is received
logInfo("Timeout in BecomingOldest. Previous oldest unknown, removed and no TakeOver request.") logInfo("Timeout in BecomingOldest. Previous oldest unknown, removed and no TakeOver request.")
tryGoToOldest() tryGotoOldest()
} else if (cluster.isTerminated) } else if (cluster.isTerminated)
stop() stop()
else else
@ -749,11 +749,11 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
} }
// Try and go to oldest, taking the lease if needed // Try and go to oldest, taking the lease if needed
def tryGoToOldest(): State = { def tryGotoOldest(): State = {
// check if lease // check if lease
lease match { lease match {
case None => case None =>
goToOldest() gotoOldest()
case Some(_) => case Some(_) =>
logInfo("Trying to acquire lease before starting singleton") logInfo("Trying to acquire lease before starting singleton")
tryAcquireLease() tryAcquireLease()
@ -764,7 +764,7 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
case Event(AcquireLeaseResult(result), _) => case Event(AcquireLeaseResult(result), _) =>
logInfo("Acquire lease result {}", result) logInfo("Acquire lease result {}", result)
if (result) { if (result) {
goToOldest() gotoOldest()
} else { } else {
setTimer(LeaseRetryTimer, LeaseRetry, leaseRetryInterval) setTimer(LeaseRetryTimer, LeaseRetry, leaseRetryInterval)
stay.using(AcquiringLeaseData(leaseRequestInProgress = false, None)) stay.using(AcquiringLeaseData(leaseRequestInProgress = false, None))
@ -800,7 +800,7 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
stop() stop()
} }
def goToOldest(): State = { def gotoOldest(): State = {
val singleton = context.watch(context.actorOf(singletonProps, singletonName)) val singleton = context.watch(context.actorOf(singletonProps, singletonName))
logInfo("Singleton manager starting singleton actor [{}]", singleton.path) logInfo("Singleton manager starting singleton actor [{}]", singleton.path)
goto(Oldest).using(OldestData(Some(singleton))) goto(Oldest).using(OldestData(Some(singleton)))