From 3b8109b393c238445bc676cbfd30363cd9efd664 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Sat, 25 Feb 2017 22:22:17 +0800 Subject: [PATCH] 1. cluster and actor module amalgamated into single one 2. created workerref class use for cover akka actorref class --- skywalking-collector/pom.xml | 1 - .../skywalking-collector-actor/pom.xml | 21 --------- .../actor/selector/WorkerSelector.java | 24 ---------- .../collector/actor/AbstractWorker.java | 3 +- .../actor/AbstractWorkerProvider.java | 1 - .../collector/actor/CollectorBootstrap.java | 2 - .../skywalking/collector/actor/WorkerRef.java | 32 ++++++++++++++ .../collector/actor/WorkersCreator.java | 0 .../actor/selector/RollingSelector.java | 13 +++--- .../actor/selector/WorkerSelector.java | 25 +++++++++++ .../collector/cluster/WorkersRefCenter.java | 44 +++++++++++-------- .../actor/AbstractWorkerProviderTestCase.java | 36 --------------- .../collector/actor/SpiTestWorker.java | 2 - .../collector/actor/SpiTestWorkerFactory.java | 5 --- .../actor/SpiTestWorkerFactoryTestCase.java | 2 - .../actor/WorkersCreatorTestCase.java | 1 - .../cluster/WorkersRefCenterTestCase.java | 27 ++++++++---- ...ing.collector.actor.AbstractWorkerProvider | 0 .../skywalking-collector-worker/pom.xml | 2 +- 19 files changed, 111 insertions(+), 130 deletions(-) delete mode 100644 skywalking-collector/skywalking-collector-actor/pom.xml delete mode 100644 skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java (94%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java (94%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java (88%) create mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRef.java rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java (100%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java (64%) create mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java (61%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java (94%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java (81%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java (97%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java (99%) rename skywalking-collector/{skywalking-collector-actor => skywalking-collector-cluster}/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.actor.AbstractWorkerProvider (100%) diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index 0a0453660..122b12c82 100644 --- a/skywalking-collector/pom.xml +++ b/skywalking-collector/pom.xml @@ -5,7 +5,6 @@ skywalking-collector-cluster skywalking-collector-worker - skywalking-collector-actor skywalking diff --git a/skywalking-collector/skywalking-collector-actor/pom.xml b/skywalking-collector/skywalking-collector-actor/pom.xml deleted file mode 100644 index a64647fd8..000000000 --- a/skywalking-collector/skywalking-collector-actor/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - skywalking-collector - com.a.eye - 3.0-2017 - - 4.0.0 - - skywalking-collector-actor - - - - com.a.eye - skywalking-collector-cluster - ${project.version} - - - \ No newline at end of file diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java b/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java deleted file mode 100644 index e2901dbb8..000000000 --- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.a.eye.skywalking.collector.actor.selector; - -import akka.actor.ActorRef; -import com.a.eye.skywalking.collector.actor.AbstractWorker; -import java.util.List; - -/** - * The WorkerSelector should be implemented - * by any class whose instances are intended to provide select a {@link ActorRef} from a {@link ActorRef} list. - *

- * Actually, the ActorRef is designed to provide a routing ability in the collector cluster. - * - * @author wusheng - */ -public interface WorkerSelector { - /** - * select a {@link ActorRef} from a {@link ActorRef} list. - * - * @param members given {@link ActorRef} list, which size is greater than 0; - * @param message the {@link AbstractWorker} is going to send. - * @return the selected {@link ActorRef} - */ - ActorRef select(List members, T message); -} diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java similarity index 94% rename from skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java rename to skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java index 3ec70c2f5..c8c5a942e 100644 --- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java @@ -9,6 +9,7 @@ import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.cluster.WorkerListenerMessage; import com.a.eye.skywalking.collector.cluster.WorkersListener; import com.a.eye.skywalking.collector.cluster.WorkersRefCenter; + import java.util.List; /** @@ -42,7 +43,7 @@ public abstract class AbstractWorker extends UntypedActor { } public void tell(AbstractWorkerProvider targetWorkerProvider, WorkerSelector selector, T message) throws Throwable { - List avaibleWorks = WorkersRefCenter.INSTANCE.availableWorks(targetWorkerProvider.roleName()); + List avaibleWorks = WorkersRefCenter.INSTANCE.availableWorks(targetWorkerProvider.roleName()); selector.select(avaibleWorks, message).tell(message, getSelf()); } diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java similarity index 94% rename from skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java rename to skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java index 026e67dc4..0020097ee 100644 --- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java @@ -2,7 +2,6 @@ package com.a.eye.skywalking.collector.actor; import akka.actor.ActorSystem; import akka.actor.Props; -import com.a.eye.skywalking.api.util.StringUtil; /** * @author pengys5 diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java similarity index 88% rename from skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java rename to skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java index 500d54d4e..7e35737d1 100644 --- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/CollectorBootstrap.java @@ -1,7 +1,5 @@ package com.a.eye.skywalking.collector.actor; -import akka.actor.ActorSystem; - /** * @author pengys5 */ diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRef.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRef.java new file mode 100644 index 000000000..c82b89470 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRef.java @@ -0,0 +1,32 @@ +package com.a.eye.skywalking.collector.actor; + +import akka.actor.ActorRef; + +/** + * @author pengys5 + */ +public class WorkerRef { + final ActorRef actorRef; + + public WorkerRef(ActorRef actorRef) { + this.actorRef = actorRef; + } + + void tell(Object message, ActorRef actorRef) { + actorRef.tell(message, actorRef); + } + + public String path(){ + return actorRef.path().toString(); + } + + @Override + public boolean equals(Object obj) { + return actorRef.equals(obj); + } + + @Override + public String toString() { + return actorRef.toString(); + } +} diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java similarity index 100% rename from skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java rename to skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java similarity index 64% rename from skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java rename to skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java index 7f6383b21..8ef322c6b 100644 --- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/RollingSelector.java @@ -1,12 +1,13 @@ package com.a.eye.skywalking.collector.actor.selector; -import akka.actor.ActorRef; import com.a.eye.skywalking.collector.actor.AbstractWorker; +import com.a.eye.skywalking.collector.actor.WorkerRef; + import java.util.List; /** * The RollingSelector is a simple implementation of {@link WorkerSelector}. - * It choose {@link ActorRef} nearly random, by round-robin. + * It choose {@link WorkerRef} nearly random, by round-robin. * * @author wusheng */ @@ -19,14 +20,14 @@ public enum RollingSelector implements WorkerSelector { private int index = 0; /** - * Use round-robin to select {@link ActorRef}. + * Use round-robin to select {@link WorkerRef}. * - * @param members given {@link ActorRef} list, which size is greater than 0; + * @param members given {@link WorkerRef} list, which size is greater than 0; * @param message the {@link AbstractWorker} is going to send. - * @return the selected {@link ActorRef} + * @return the selected {@link WorkerRef} */ @Override - public ActorRef select(List members, Object message) { + public WorkerRef select(List members, Object message) { int size = members.size(); index++; int selectIndex = Math.abs(index) % size; diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java new file mode 100644 index 000000000..3582d868c --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/WorkerSelector.java @@ -0,0 +1,25 @@ +package com.a.eye.skywalking.collector.actor.selector; + +import com.a.eye.skywalking.collector.actor.AbstractWorker; +import com.a.eye.skywalking.collector.actor.WorkerRef; + +import java.util.List; + +/** + * The WorkerSelector should be implemented + * by any class whose instances are intended to provide select a {@link WorkerRef} from a {@link WorkerRef} list. + *

+ * Actually, the WorkerRef is designed to provide a routing ability in the collector cluster. + * + * @author wusheng + */ +public interface WorkerSelector { + /** + * select a {@link WorkerRef} from a {@link WorkerRef} list. + * + * @param members given {@link WorkerRef} list, which size is greater than 0; + * @param message the {@link AbstractWorker} is going to send. + * @return the selected {@link WorkerRef} + */ + WorkerRef select(List members, T message); +} diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenter.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenter.java index 41d52b577..9856fe194 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenter.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenter.java @@ -1,6 +1,7 @@ package com.a.eye.skywalking.collector.cluster; import akka.actor.ActorRef; +import com.a.eye.skywalking.collector.actor.WorkerRef; import java.util.ArrayList; import java.util.Collections; @@ -18,38 +19,45 @@ import java.util.concurrent.ConcurrentHashMap; public enum WorkersRefCenter { INSTANCE; - private Map> roleToActor = new ConcurrentHashMap(); + private Map> roleToActor = new ConcurrentHashMap(); - private Map actorToRole = new ConcurrentHashMap(); + private Map actorToRole = new ConcurrentHashMap(); - public void register(ActorRef newRef, String workerRole) { +// private Map pathToWorkerRef = new ConcurrentHashMap(); + + public void register(ActorRef newActorRef, String workerRole) { if (!roleToActor.containsKey(workerRole)) { - List actorList = Collections.synchronizedList(new ArrayList()); + List actorList = Collections.synchronizedList(new ArrayList()); roleToActor.putIfAbsent(workerRole, actorList); } - roleToActor.get(workerRole).add(newRef); - actorToRole.put(newRef, workerRole); + + WorkerRef newWorkerRef = new WorkerRef(newActorRef); + roleToActor.get(workerRole).add(newWorkerRef); + actorToRole.put(newWorkerRef, workerRole); +// pathToWorkerRef.put(newWorkerRef.path(), newWorkerRef); } - public void unregister(ActorRef newRef) { - String workerRole = actorToRole.get(newRef); - roleToActor.get(workerRole).remove(newRef); - actorToRole.remove(newRef); + public void unregister(ActorRef newActorRef) { + String workerRole = actorToRole.get(newActorRef.path()); +// WorkerRef workerRef = pathToWorkerRef.get(newActorRef.path()); + + roleToActor.get(workerRole).remove(newActorRef); + actorToRole.remove(newActorRef); +// pathToWorkerRef.remove(newActorRef.path()); } /** - * Get a copy all available {@link ActorRef} list, by the given worker role. + * Get all available {@link WorkerRef} list, by the given worker role. + * * @param workerRole the given role - * @return available {@link ActorRef} list + * @return available {@link WorkerRef} list * @throws NoAvailableWorkerException , when no available worker. */ - public List availableWorks(String workerRole) throws NoAvailableWorkerException { - List refs = roleToActor.get(workerRole); - if(refs == null || refs.size() == 0){ + public List availableWorks(String workerRole) throws NoAvailableWorkerException { + List refs = roleToActor.get(workerRole); + if (refs == null || refs.size() == 0) { throw new NoAvailableWorkerException("role=" + workerRole + ", no available worker."); } - List availableList = new ArrayList<>(refs.size()); - availableList.addAll(refs); - return Collections.unmodifiableList(availableList); + return Collections.unmodifiableList(refs); } } diff --git a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java similarity index 61% rename from skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java rename to skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java index a95fae6f3..cc08b8bc5 100644 --- a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java @@ -1,9 +1,6 @@ package com.a.eye.skywalking.collector.actor; -import akka.actor.ActorRef; -import akka.actor.ActorSelection; import akka.actor.ActorSystem; -import akka.testkit.JavaTestKit; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -12,8 +9,6 @@ import org.junit.Test; * @author pengys5 */ public class AbstractWorkerProviderTestCase { - - ActorSystem system; @Before @@ -28,36 +23,9 @@ public class AbstractWorkerProviderTestCase { system = null; } - @Test(expected = IllegalArgumentException.class) - public void testCreateWorkerWhenWorkNameIsNull() { - AbstractWorkerProvider aWorkerProvider = new AbstractWorkerProvider() { - @Override - public String workerRole() { - return null; - } - - @Override - public Class workerClass() { - return Object.class; - } - - @Override - public int workerNum() { - return 1; - } - }; - - aWorkerProvider.createWorker(system); - } - @Test(expected = IllegalArgumentException.class) public void testCreateWorkerWhenWorkerClassIsNull() { AbstractWorkerProvider aWorkerProvider = new AbstractWorkerProvider() { - @Override - public String workerRole() { - return "Test"; - } - @Override public Class workerClass() { return Object.class; @@ -75,10 +43,6 @@ public class AbstractWorkerProviderTestCase { @Test(expected = IllegalArgumentException.class) public void testCreateWorkerWhenWorkerNumLessThan_1() { AbstractWorkerProvider aWorkerProvider = new AbstractWorkerProvider() { - @Override - public String workerRole() { - return "Test"; - } @Override public Class workerClass() { diff --git a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java similarity index 94% rename from skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java rename to skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java index 5115ecf52..df929f59d 100644 --- a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorker.java @@ -1,7 +1,5 @@ package com.a.eye.skywalking.collector.actor; -import akka.japi.Creator; - /** * @author pengys5 */ diff --git a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java similarity index 81% rename from skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java rename to skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java index b192e59fd..f68399bce 100644 --- a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactory.java @@ -7,11 +7,6 @@ public class SpiTestWorkerFactory extends AbstractWorkerProvider { public static final String WorkerRole = "SpiTestWorker"; - @Override - public String workerRole() { - return WorkerRole; - } - @Override public Class workerClass() { return SpiTestWorker.class; diff --git a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java similarity index 97% rename from skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java rename to skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java index 321a13dbe..802922310 100644 --- a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/SpiTestWorkerFactoryTestCase.java @@ -5,13 +5,11 @@ import akka.testkit.JavaTestKit; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; /** * @author pengys5 */ public class SpiTestWorkerFactoryTestCase { - ActorSystem system; @Before diff --git a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java similarity index 99% rename from skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java rename to skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java index 729a2a7de..4d4c0f0e5 100644 --- a/skywalking-collector/skywalking-collector-actor/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/WorkersCreatorTestCase.java @@ -10,7 +10,6 @@ import org.junit.Test; * @author pengys5 */ public class WorkersCreatorTestCase { - ActorSystem system; @Before diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenterTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenterTestCase.java index 9c23b165a..0d57c71cb 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenterTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/cluster/WorkersRefCenterTestCase.java @@ -4,6 +4,7 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Props; import akka.testkit.TestActorRef; +import com.a.eye.skywalking.collector.actor.WorkerRef; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -47,14 +48,22 @@ public class WorkersRefCenterTestCase { WorkersRefCenter.INSTANCE.register(actorRef2, "WorkersListener"); WorkersRefCenter.INSTANCE.register(actorRef3, "WorkersListener"); - Map actorToRole = (Map) MemberModifier.field(WorkersRefCenter.class, "actorToRole").get(WorkersRefCenter.INSTANCE); - Assert.assertEquals("WorkersListener", actorToRole.get(actorRef1)); - Assert.assertEquals("WorkersListener", actorToRole.get(actorRef2)); - Assert.assertEquals("WorkersListener", actorToRole.get(actorRef3)); + Map actorToRole = (Map) MemberModifier.field(WorkersRefCenter.class, "actorToRole").get(WorkersRefCenter.INSTANCE); - Map> roleToActor = (Map>) MemberModifier.field(WorkersRefCenter.class, "roleToActor").get(WorkersRefCenter.INSTANCE); - ActorRef[] actorRefs = {actorRef1, actorRef2, actorRef3}; - Assert.assertArrayEquals(actorRefs, roleToActor.get("WorkersListener").toArray()); + for (Map.Entry entry : actorToRole.entrySet()) { + WorkerRef workerRef = entry.getKey(); + if (workerRef.equals(actorRef1) || workerRef.equals(actorRef2) || workerRef.equals(actorRef3)) { + Assert.assertEquals("WorkersListener", entry.getValue()); + } else { + Assert.fail(); + } + } + + Map> roleToActor = (Map>) MemberModifier.field(WorkersRefCenter.class, "roleToActor").get(WorkersRefCenter.INSTANCE); + List workerRefs = roleToActor.get("WorkersListener"); + Assert.assertEquals(actorRef1.path().toString(), workerRefs.get(0).path().toString()); + Assert.assertEquals(actorRef2.path().toString(), workerRefs.get(1).path().toString()); + Assert.assertEquals(actorRef3.path().toString(), workerRefs.get(2).path().toString()); } @Test @@ -79,7 +88,7 @@ public class WorkersRefCenterTestCase { } @Test - public void testSizeOf(){ + public void testSizeOf() throws NoAvailableWorkerException { final Props props = Props.create(WorkersListener.class); final TestActorRef actorRef1 = TestActorRef.create(system, props, "WorkersListener1"); final TestActorRef actorRef2 = TestActorRef.create(system, props, "WorkersListener2"); @@ -89,6 +98,6 @@ public class WorkersRefCenterTestCase { WorkersRefCenter.INSTANCE.register(actorRef2, "WorkersListener"); WorkersRefCenter.INSTANCE.register(actorRef3, "WorkersListener"); - Assert.assertEquals(3, WorkersRefCenter.INSTANCE.sizeOf("WorkersListener")); + Assert.assertEquals(3, WorkersRefCenter.INSTANCE.availableWorks("WorkersListener").size()); } } diff --git a/skywalking-collector/skywalking-collector-actor/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.actor.AbstractWorkerProvider b/skywalking-collector/skywalking-collector-cluster/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.actor.AbstractWorkerProvider similarity index 100% rename from skywalking-collector/skywalking-collector-actor/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.actor.AbstractWorkerProvider rename to skywalking-collector/skywalking-collector-cluster/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.actor.AbstractWorkerProvider diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml index 1da9ae65c..0f03e8852 100644 --- a/skywalking-collector/skywalking-collector-worker/pom.xml +++ b/skywalking-collector/skywalking-collector-worker/pom.xml @@ -14,7 +14,7 @@ com.a.eye - skywalking-collector-actor + skywalking-collector-cluster ${project.version}