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

Merge master into re feature branch (#29135)

Browse source 
* Merge master into feature branch

* Formatting

* Remove redundant fixme

* Remove files that snuck in

* Fix backoff supervisor test
This commit is contained in:
Christopher Batey 2020-05-27 12:50:53 +01:00 • committed by GitHub
parent 7dfb34f37e
commit b463a1adbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2032 changed files with 24805 additions and 11402 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
View file

@ -78,7 +78,7 @@ private[akka] object Shard {
final case class LeaseAcquireResult(acquired: Boolean, reason: Option[Throwable]) extends DeadLetterSuppression
final case class LeaseLost(reason: Option[Throwable]) extends DeadLetterSuppression
final case object LeaseRetry extends DeadLetterSuppression
case object LeaseRetry extends DeadLetterSuppression
private val LeaseRetryTimer = "lease-retry"
def props(
@ -253,9 +253,10 @@ private[akka] class Shard(
import ShardRegion.Passivate
import ShardRegion.ShardInitialized
import ShardRegion.handOffStopperProps
import settings.tuningParameters._
import akka.cluster.sharding.ShardCoordinator.Internal.CoordinatorMessage
import akka.cluster.sharding.ShardRegion.ShardRegionCommand
import settings.tuningParameters._
private val rememberEntitiesStore: Option[ActorRef] =
rememberEntitiesProvider.map { provider =>