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

Fix race in ClusterShardingFailureSpec

Browse source 
AFAICT there was nothing ensuring the order of messages when sent to the
shard and the region so first checkthat the passivation has happened
before sending another add in the test

Refs #24013
This commit is contained in:
Christopher Batey 2017-11-20 16:34:38 +00:00
parent 6db974b6f4
commit 99511a0027
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala
View file

@ -11,7 +11,6 @@ import org.apache.commons.io.FileUtils
import com.typesafe.config.ConfigFactory
import akka.actor._
import akka.cluster.Cluster
import akka.cluster.ClusterEvent._
import akka.persistence.Persistence
import akka.persistence.journal.leveldb.SharedLeveldbJournal
import akka.persistence.journal.leveldb.SharedLeveldbStore
@ -32,8 +31,8 @@ object ClusterShardingFailureSpec {
var n = 0
def receive = {
case Get(id) ⇒ sender() ! Value(id, n)
case Add(id, i) ⇒ n += i
case Get(id) ⇒ sender() ! Value(id, n)
case Add(_, i) ⇒ n += i
}
}
@ -155,7 +154,7 @@ abstract class ClusterShardingFailureSpec(config: ClusterShardingFailureSpecConf
runOn(controller) {
system.actorOf(Props[SharedLeveldbStore], "store")
}
enterBarrier("peristence-started")
enterBarrier("persistence-started")
runOn(first, second) {
system.actorSelection(node(controller) / "user" / "store") ! Identify(None)
@ -202,7 +201,7 @@ abstract class ClusterShardingFailureSpec(config: ClusterShardingFailureSpecConf
region ! Add("40", 4)
val probe = TestProbe()
region.tell(Get("40"), probe.ref)
probe.expectNoMsg(1.second)
probe.expectNoMessage(1.second)
}
enterBarrier("first-delayed")
@ -231,6 +230,12 @@ abstract class ClusterShardingFailureSpec(config: ClusterShardingFailureSpecConf
//Test the Shard passivate works after a journal failure
shard2.tell(Passivate(PoisonPill), entity21)
awaitCond({
region ! Get("21")
expectMsgType[Value] == Value("21", 0)
}, message = "Passivating did not reset Value down to 0")
region ! Add("21", 1)
region ! Get("21")