You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/03/11 13:07:52 UTC
[incubator-skywalking] branch k8s-Coordinator-role updated: Rename
service.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch k8s-Coordinator-role
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/k8s-Coordinator-role by this push:
new b5f8656 Rename service.
b5f8656 is described below
commit b5f8656e1bd09f80460edbdcb8730f9d7fa92c58
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Mar 11 21:07:42 2019 +0800
Rename service.
---
.../cluster/plugin/kubernetes/KubernetesCoordinator.java | 6 +++---
.../skywalking/oap/server/core/CoreModuleProvider.java | 2 +-
.../config/{gRPCConfigService.java => ConfigService.java} | 13 +++++++------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
index c91bd9a..af11b06 100644
--- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
+++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
@@ -27,7 +27,7 @@ import java.util.function.Supplier;
import javax.annotation.Nullable;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.cluster.*;
-import org.apache.skywalking.oap.server.core.config.gRPCConfigService;
+import org.apache.skywalking.oap.server.core.config.ConfigService;
import org.apache.skywalking.oap.server.core.remote.client.Address;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext;
@@ -130,8 +130,8 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery
portSetLock.lock();
try {
logger.debug("Query kubernetes remote, port hasn't init, try to init");
- gRPCConfigService service = manager.find(CoreModule.NAME).provider().getService(gRPCConfigService.class);
- port = service.getPort();
+ ConfigService service = manager.find(CoreModule.NAME).provider().getService(ConfigService.class);
+ port = service.getGRPCPort();
logger.debug("Query kubernetes remote, port is set at {}", port);
cache.values().forEach(instance -> instance.getAddress().setPort(port));
} finally {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
index 222afea..0cfc956 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@ -106,7 +106,7 @@ public class CoreModuleProvider extends ModuleProvider {
jettyServer = new JettyServer(moduleConfig.getRestHost(), moduleConfig.getRestPort(), moduleConfig.getRestContextPath(), moduleConfig.getJettySelectors());
jettyServer.initialize();
- this.registerServiceImplementation(gRPCConfigService.class, new gRPCConfigService(moduleConfig.getGRPCHost(), moduleConfig.getGRPCPort()));
+ this.registerServiceImplementation(ConfigService.class, new ConfigService(moduleConfig));
this.registerServiceImplementation(DownsamplingConfigService.class, new DownsamplingConfigService(moduleConfig.getDownsampling()));
this.registerServiceImplementation(GRPCHandlerRegister.class, new GRPCHandlerRegisterImpl(grpcServer));
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/gRPCConfigService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java
similarity index 75%
rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/gRPCConfigService.java
rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java
index d5a1d15..36cf031 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/gRPCConfigService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java
@@ -19,18 +19,19 @@
package org.apache.skywalking.oap.server.core.config;
import lombok.Getter;
+import org.apache.skywalking.oap.server.core.CoreModuleConfig;
import org.apache.skywalking.oap.server.library.module.Service;
/**
* @author wusheng
*/
@Getter
-public class gRPCConfigService implements Service {
- private String host;
- private int port;
+public class ConfigService implements Service {
+ private String gRPCHost;
+ private int gRPCPort;
- public gRPCConfigService(String host, int port) {
- this.host = host;
- this.port = port;
+ public ConfigService(CoreModuleConfig moduleConfig) {
+ this.gRPCHost = moduleConfig.getGRPCHost();
+ this.gRPCPort = moduleConfig.getGRPCPort();
}
}