From bb0a7c09dd75c1ea1bbdee1879ef08fda2e4c575 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 10 Aug 2020 10:36:05 +0200 Subject: [PATCH] fix write consistency timeout in Sharding, #29344 --- .../main/scala/akka/cluster/sharding/ShardCoordinator.scala | 4 ++-- .../sharding/internal/DDataRememberEntitiesShardStore.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala index 4b4adb3e19..090b882020 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala @@ -1150,8 +1150,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) diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala index 6766f8d5db..16ebc573cd 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala @@ -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)