Repository: usergrid Updated Branches: refs/heads/master e83b54e83 -> 14b5fe014
Use one and only one Akka cluster for all queue tests. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/14b5fe01 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/14b5fe01 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/14b5fe01 Branch: refs/heads/master Commit: 14b5fe014261c63298f19b3361507f3ced5aa84e Parents: e83b54e Author: Dave Johnson <snoopd...@apache.org> Authored: Tue Nov 15 11:07:47 2016 -0800 Committer: Dave Johnson <snoopd...@apache.org> Committed: Tue Nov 15 11:07:47 2016 -0800 ---------------------------------------------------------------------- .../actorsystem/ActorSystemManagerImpl.java | 4 ++-- .../usergrid/persistence/qakka/AbstractAkkaTest.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/14b5fe01/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java index f43b6e9..bfa3abe 100644 --- a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java +++ b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java @@ -196,7 +196,7 @@ public class ActorSystemManagerImpl implements ActorSystemManager { // register our cluster listener clusterSystem.actorOf(Props.create(ClusterListener.class, getSeedsByRegion(), getCurrentRegion()), - "clusterListener_" + port ); + "clusterListener" ); createClientActors( clusterSystem ); @@ -408,7 +408,7 @@ public class ActorSystemManagerImpl implements ActorSystemManager { // Each clientActor needs to know path to ClusterSingletonProxy and region clientActor = system.actorOf( - Props.create( ClientActor.class, routersByMessageType ), "clientActor_" + port ); + Props.create( ClientActor.class, routersByMessageType ), "clientActor" ); ClusterClientReceptionist.get(system).registerService( clientActor ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/14b5fe01/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java index 22a6327..467d542 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java @@ -32,6 +32,8 @@ public abstract class AbstractAkkaTest extends AbstractTest { static AtomicInteger nextPort = new AtomicInteger(3551); + static App app = null; + protected static int getNextAkkaPort() { int ret = nextPort.getAndIncrement(); logger.info("Returning port {}", ret); @@ -39,11 +41,13 @@ public abstract class AbstractAkkaTest extends AbstractTest { } @BeforeClass - public static void startAkkaCluster() { - ActorSystemFig actorSystemFig = getInjector().getInstance( ActorSystemFig.class ); + public static synchronized void startAkkaCluster() { + + if ( app == null ) { + ActorSystemFig actorSystemFig = getInjector().getInstance( ActorSystemFig.class ); + app = getInjector().getInstance( App.class ); + app.start( "localhost", getNextAkkaPort(), actorSystemFig.getRegionLocal() ); + } - String region = actorSystemFig.getRegionLocal(); - App app = getInjector().getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); } }
