Merge pull request #29471 from akka/wip-29344-write-timeout-patriknw

fix write consistency timeout in Sharding, #29344
This commit is contained in:
Patrik Nordwall 2020-08-18 12:23:49 +02:00 committed by GitHub
commit 0601b7e83c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -1156,8 +1156,8 @@ private[akka] class DDataShardCoordinator(
case additional => ReadMajorityPlus(settings.tuningParameters.waitingForStateTimeout, majorityMinCap, additional)
}
private val stateWriteConsistency = settings.tuningParameters.coordinatorStateWriteMajorityPlus match {
case Int.MaxValue => WriteAll(settings.tuningParameters.waitingForStateTimeout)
case additional => WriteMajorityPlus(settings.tuningParameters.waitingForStateTimeout, majorityMinCap, additional)
case Int.MaxValue => WriteAll(settings.tuningParameters.updatingStateTimeout)
case additional => WriteMajorityPlus(settings.tuningParameters.updatingStateTimeout, majorityMinCap, additional)
}
implicit val node: Cluster = Cluster(context.system)

View file

@ -95,7 +95,7 @@ private[akka] final class DDataRememberEntitiesShardStore(
if (log.isDebugEnabled) {
log.debug(
"Starting up DDataRememberEntitiesStore, write timeout: [{}], read timeout: [{}], majority min cap: [{}]",
"Starting up DDataRememberEntitiesStore, read timeout: [{}], write timeout: [{}], majority min cap: [{}]",
settings.tuningParameters.waitingForStateTimeout.pretty,
settings.tuningParameters.updatingStateTimeout.pretty,
majorityMinCap)