[incubator-skywalking] branch master updated: Fix start when not config in provider and don't get module in prepare stage. (#1711)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f43cb9  Fix start when not config in provider and don't get module in prepare stage. (#1711)
2f43cb9 is described below

commit 2f43cb940eb4308a739c3392f04533b3e73e6345
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Sep 27 16:07:04 2018 +0800

    Fix start when not config in provider and don't get module in prepare stage. (#1711)
---
 .../apache/skywalking/oap/server/library/module/ModuleDefine.java   | 3 +++
 .../skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java   | 6 +++---
 oap-server/server-starter/src/main/resources/application.yml        | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java
index 5278215..c9e5e12 100644
--- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java
+++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java
@@ -90,6 +90,9 @@ public abstract class ModuleDefine {
 
     private void copyProperties(ModuleConfig dest, Properties src, String moduleName,
         String providerName) throws IllegalAccessException {
+        if (dest == null) {
+            return;
+        }
         Enumeration<?> propertyNames = src.propertyNames();
         while (propertyNames.hasMoreElements()) {
             String propertyName = (String)propertyNames.nextElement();
diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
index 05c6d49..e96b03c 100644
--- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
+++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
@@ -47,6 +47,9 @@ public class MeshReceiverProvider extends ModuleProvider {
     }
 
     @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException {
+    }
+
+    @Override public void start() throws ServiceNotProvidedException, ModuleStartException {
         MeshDataBufferFileCache cache = new MeshDataBufferFileCache(config);
         try {
             cache.start();
@@ -54,9 +57,6 @@ public class MeshReceiverProvider extends ModuleProvider {
         } catch (IOException e) {
             throw new ModuleStartException(e.getMessage(), e);
         }
-    }
-
-    @Override public void start() throws ServiceNotProvidedException, ModuleStartException {
         CoreRegisterLinker.setModuleManager(getManager());
         GRPCHandlerRegister service = getManager().find(CoreModule.NAME).getService(GRPCHandlerRegister.class);
         service.addHandler(new MeshGRPCHandler());
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 9290a93..625aac6 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -53,7 +53,7 @@ receiver-register:
   default:
 receiver-trace:
   default:
-    bufferPath: ../buffer/  # Path to trace buffer files, suggest to use absolute path
+    bufferPath: ../trace-buffer/  # Path to trace buffer files, suggest to use absolute path
     bufferOffsetMaxFileSize: 100 # Unit is MB
     bufferDataMaxFileSize: 500 # Unit is MB
     bufferFileCleanWhenRestart: false
@@ -61,6 +61,10 @@ receiver-jvm:
   default:
 service-mesh:
   default:
+    bufferPath: ../mesh-buffer/  # Path to trace buffer files, suggest to use absolute path
+    bufferOffsetMaxFileSize: 100 # Unit is MB
+    bufferDataMaxFileSize: 500 # Unit is MB
+    bufferFileCleanWhenRestart: false
 istio-telemetry:
   default:
 query: