You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/01/17 07:44:18 UTC
[incubator-dolphinscheduler] branch dev-1.2.1 updated: add
LoggerServer RPC PORT modified. #1848 (#1849)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev-1.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.2.1 by this push:
new 4c0147d add LoggerServer RPC PORT modified. #1848 (#1849)
4c0147d is described below
commit 4c0147d0e879bb318bad97ae4a9781d38c2b7bfc
Author: qiaozhanwei <qi...@outlook.com>
AuthorDate: Fri Jan 17 15:44:07 2020 +0800
add LoggerServer RPC PORT modified. #1848 (#1849)
* fix #1775 bugļ¼delete process definition when process instance is running
* revert CONTRIBUTING.md
* dockerfile modify
* dockerfile modify
* dockerfile modify
* remove install.sh server.servlet.context-path replace
* add LoggerServer RPC PORT modified. #1848
---
.../main/java/org/apache/dolphinscheduler/common/Constants.java | 4 ++--
dolphinscheduler-common/src/main/resources/common.properties | 4 ++++
.../java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java | 7 ++++---
.../org/apache/dolphinscheduler/server/utils/ProcessUtils.java | 4 +++-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 9cb1a58..69dbf10 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -444,9 +444,9 @@ public final class Constants {
/***
*
- * rpc port
+ * logger server rpc port
*/
- public static final int RPC_PORT = 50051;
+ public static final String LOGGER_SERVER_RPC_PORT = "loggerserver.rpc.port";
/**
* forbid running task
diff --git a/dolphinscheduler-common/src/main/resources/common.properties b/dolphinscheduler-common/src/main/resources/common.properties
index 5a4aa14..d78cf19 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -92,3 +92,7 @@ yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
+# logger server rpc port
+loggerserver.rpc.port=50051
+
+
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java
index 5ec5df9..4e0e459 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java
@@ -24,6 +24,8 @@ import io.grpc.ServerBuilder;
import org.apache.dolphinscheduler.rpc.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
import java.io.*;
import java.nio.file.Files;
@@ -31,6 +33,7 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.dolphinscheduler.common.utils.PropertyUtils;
/**
* logger server
@@ -50,7 +53,7 @@ public class LoggerServer {
*/
public void start() throws IOException {
/* The port on which the server should run */
- int port = Constants.RPC_PORT;
+ int port = PropertyUtils.getInt(Constants.LOGGER_SERVER_RPC_PORT);
server = ServerBuilder.forPort(port)
.addService(new LogViewServiceGrpcImpl())
.build()
@@ -114,7 +117,6 @@ public class LoggerServer {
request.getLimit());
List<String> list = readFile(request.getPath(), request.getSkipLineNum(), request.getLimit());
StringBuilder sb = new StringBuilder();
- boolean errorLineFlag = false;
for (String line : list){
sb.append(line + "\r\n");
}
@@ -215,7 +217,6 @@ public class LoggerServer {
StringBuilder sb = new StringBuilder();
try {
br = new BufferedReader(new InputStreamReader(new FileInputStream(path)));
- boolean errorLineFlag = false;
while ((line = br.readLine()) != null){
sb.append(line + "\r\n");
}
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
index 748c8f0..000321f 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.server.utils;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.CommonUtils;
import org.apache.dolphinscheduler.common.utils.OSUtils;
+import org.apache.dolphinscheduler.common.utils.PropertyUtils;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.server.rpc.LogClient;
import org.apache.commons.io.FileUtils;
@@ -374,7 +375,8 @@ public class ProcessUtils {
public static void killYarnJob(TaskInstance taskInstance) {
try {
Thread.sleep(Constants.SLEEP_TIME_MILLIS);
- LogClient logClient = new LogClient(taskInstance.getHost(), Constants.RPC_PORT);
+ int port = PropertyUtils.getInt(Constants.LOGGER_SERVER_RPC_PORT);
+ LogClient logClient = new LogClient(taskInstance.getHost(), port);
String log = logClient.viewLog(taskInstance.getLogPath());
if (StringUtils.isNotEmpty(log)) {