From a6ca67f6bf08d26f494cd56ca8d697ca25897c38 Mon Sep 17 00:00:00 2001
From: pengys5 <8082209@qq.com>
Date: Fri, 3 Mar 2017 20:14:29 +0800
Subject: [PATCH] main test
---
skywalking-collector/pom.xml | 120 ++++++++++--------
.../collector/actor/AbstractMember.java | 2 +-
.../actor/AbstractMemberProvider.java | 1 +
.../collector/actor/AbstractWorker.java | 29 ++++-
.../actor/AbstractWorkerProvider.java | 5 +
.../collector/actor/WorkersCreator.java | 9 ++
.../collector/cluster/WorkersListener.java | 6 +
.../skywalking-collector-worker/pom.xml | 6 +
.../worker/CollectorBootStartUp.java | 21 ++-
.../worker/application/ApplicationMember.java | 18 ++-
.../metric/TraceSegmentRecordMember.java | 16 ++-
.../applicationref/ApplicationRefMember.java | 4 +-
.../metric/TraceSegmentRelationActor.java | 13 --
.../worker/receiver/TraceSegmentReceiver.java | 8 +-
...ing.collector.actor.AbstractWorkerProvider | 9 +-
.../src/main/resources/collector.config | 6 +-
.../src/main/resources/log4j2.xml | 13 ++
.../collector/worker/StartUpTestCase.java | 54 ++++++++
18 files changed, 249 insertions(+), 91 deletions(-)
delete mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/metric/TraceSegmentRelationActor.java
create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml
create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/StartUpTestCase.java
diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml
index 0b7ddef07..2aaca88e7 100644
--- a/skywalking-collector/pom.xml
+++ b/skywalking-collector/pom.xml
@@ -1,61 +1,71 @@
- 4.0.0
-
- skywalking-collector-cluster
- skywalking-collector-worker
-
-
- skywalking
- com.a.eye
- 3.0-2017
-
- skywalking-collector
- pom
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 4.0.0
+
+ skywalking-collector-cluster
+ skywalking-collector-worker
+
+
+ skywalking
+ com.a.eye
+ 3.0-2017
+
+ skywalking-collector
+ pom
-
- 2.4.17
-
+
+ 2.4.17
+
-
-
- com.typesafe.akka
- akka-cluster_2.11
- ${akka.version}
-
-
- com.typesafe.akka
- akka-cluster-metrics_2.11
- ${akka.version}
-
-
- com.typesafe.akka
- akka-cluster-tools_2.11
- ${akka.version}
-
-
- com.typesafe.akka
- akka-persistence_2.11
- ${akka.version}
-
-
- org.iq80.leveldb
- leveldb
- 0.9
-
+
+
+ com.typesafe.akka
+ akka-cluster_2.11
+ ${akka.version}
+
+
+ com.typesafe.akka
+ akka-cluster-metrics_2.11
+ ${akka.version}
+
+
+ com.typesafe.akka
+ akka-cluster-tools_2.11
+ ${akka.version}
+
+
+ com.typesafe.akka
+ akka-persistence_2.11
+ ${akka.version}
+
+
+ org.iq80.leveldb
+ leveldb
+ 0.9
+
+
+ com.a.eye
+ skywalking-logging-api
+ ${project.version}
+
+
+ com.a.eye
+ skywalking-logging-impl-log4j2
+ ${project.version}
+
-
- com.typesafe.akka
- akka-testkit_2.11
- ${akka.version}
- test
-
-
- com.a.eye
- skywalking-sniffer-mock
- ${project.version}
- test
-
-
+
+ com.typesafe.akka
+ akka-testkit_2.11
+ ${akka.version}
+ test
+
+
+ com.a.eye
+ skywalking-sniffer-mock
+ ${project.version}
+ test
+
+
diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java
index 9c6f743ba..8514ebeaf 100644
--- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java
+++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java
@@ -29,7 +29,7 @@ public abstract class AbstractMember {
}
- public abstract void preStart() throws Throwable;
+ public abstract void preStart() throws Exception;
/**
* Receive the message to analyse.
diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMemberProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMemberProvider.java
index 9f47d8d35..16c5041e2 100644
--- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMemberProvider.java
+++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMemberProvider.java
@@ -18,6 +18,7 @@ public abstract class AbstractMemberProvider {
Constructor memberConstructor = memberClass().getDeclaredConstructor(new Class[]{MemberSystem.class, ActorRef.class});
memberConstructor.setAccessible(true);
AbstractMember member = (AbstractMember) memberConstructor.newInstance(system, actorRef);
+ member.preStart();
system.memberOf(member, roleName());
}
diff --git a/skywalking-collector/skywalking-collector-cluster/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
index f98072a44..c11fb494c 100644
--- a/skywalking-collector/skywalking-collector-cluster/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
@@ -1,5 +1,6 @@
package com.a.eye.skywalking.collector.actor;
+import akka.actor.Terminated;
import akka.actor.UntypedActor;
import akka.cluster.ClusterEvent;
import akka.cluster.Member;
@@ -8,6 +9,9 @@ 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 org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import scala.Option;
import java.util.List;
@@ -37,8 +41,22 @@ import java.util.List;
*/
public abstract class AbstractWorker extends UntypedActor {
+ private Logger logger = LogManager.getFormatterLogger(AbstractWorker.class);
+
private MemberSystem memberSystem = new MemberSystem();
+ @Override
+ public void preStart() throws Exception {
+ super.preStart();
+ register();
+ }
+
+ @Override
+ public void preRestart(Throwable reason, Option