Merge pull request #1008 from akka/wip-2875-TransformationSampleJapiSpec-patriknw

Correction of within time in TransformationSampleJapiSpec, see #2875
This commit is contained in:
Patrik Nordwall 2013-01-11 03:33:44 -08:00
commit cb41c1f930
3 changed files with 6 additions and 8 deletions

View file

@ -7,7 +7,6 @@ import sample.cluster.transformation.japi.TransformationMessages.TransformationR
import akka.actor.UntypedActor; import akka.actor.UntypedActor;
import akka.cluster.Cluster; import akka.cluster.Cluster;
import akka.cluster.ClusterEvent.CurrentClusterState; import akka.cluster.ClusterEvent.CurrentClusterState;
import akka.cluster.ClusterEvent.MemberEvent;
import akka.cluster.ClusterEvent.MemberUp; import akka.cluster.ClusterEvent.MemberUp;
import akka.cluster.Member; import akka.cluster.Member;
import akka.cluster.MemberStatus; import akka.cluster.MemberStatus;
@ -18,10 +17,10 @@ public class TransformationBackend extends UntypedActor {
Cluster cluster = Cluster.get(getContext().system()); Cluster cluster = Cluster.get(getContext().system());
//subscribe to cluster changes, MemberEvent //subscribe to cluster changes, MemberUp
@Override @Override
public void preStart() { public void preStart() {
cluster.subscribe(getSelf(), MemberEvent.class); cluster.subscribe(getSelf(), MemberUp.class);
} }
//re-subscribe when restart //re-subscribe when restart

View file

@ -12,7 +12,6 @@ import akka.actor.RootActorPath
import akka.actor.Terminated import akka.actor.Terminated
import akka.cluster.Cluster import akka.cluster.Cluster
import akka.cluster.ClusterEvent.CurrentClusterState import akka.cluster.ClusterEvent.CurrentClusterState
import akka.cluster.ClusterEvent.MemberEvent
import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterEvent.MemberUp
import akka.cluster.Member import akka.cluster.Member
import akka.cluster.MemberStatus import akka.cluster.MemberStatus
@ -90,9 +89,9 @@ class TransformationBackend extends Actor {
val cluster = Cluster(context.system) val cluster = Cluster(context.system)
// subscribe to cluster changes, MemberEvent // subscribe to cluster changes, MemberUp
// re-subscribe when restart // re-subscribe when restart
override def preStart(): Unit = cluster.subscribe(self, classOf[MemberEvent]) override def preStart(): Unit = cluster.subscribe(self, classOf[MemberUp])
override def postStop(): Unit = cluster.unsubscribe(self) override def postStop(): Unit = cluster.unsubscribe(self)
def receive = { def receive = {

View file

@ -72,7 +72,7 @@ abstract class TransformationSampleJapiSpec extends MultiNodeSpec(Transformation
testConductor.enter("frontend1-started") testConductor.enter("frontend1-started")
} }
"illustrate how a backend automatically registers" in within(20 seconds) { "illustrate how a backend automatically registers" in within(15 seconds) {
runOn(backend1) { runOn(backend1) {
Cluster(system) join node(frontend1).address Cluster(system) join node(frontend1).address
system.actorOf(Props[TransformationBackend], name = "backend") system.actorOf(Props[TransformationBackend], name = "backend")
@ -86,7 +86,7 @@ abstract class TransformationSampleJapiSpec extends MultiNodeSpec(Transformation
testConductor.enter("frontend1-backend1-ok") testConductor.enter("frontend1-backend1-ok")
} }
"illustrate how more nodes registers" in within(15 seconds) { "illustrate how more nodes registers" in within(20 seconds) {
runOn(frontend2) { runOn(frontend2) {
Cluster(system) join node(frontend1).address Cluster(system) join node(frontend1).address
system.actorOf(Props[TransformationFrontend], name = "frontend") system.actorOf(Props[TransformationFrontend], name = "frontend")