This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 7eb7efb compatible old version host not port delete log file (#2811)
7eb7efb is described below
commit 7eb7efbd3472e8a0c2ed050a3ea98becd296f690
Author: qiaozhanwei <[email protected]>
AuthorDate: Mon May 25 17:59:02 2020 +0800
compatible old version host not port delete log file (#2811)
* add LoggerServerTest UT
* add LoggerServerTest UT
* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest
* master select worker filter high load worker #2704
* master select worker filter high load worker #2704
* master select worker filter high load worker #2704
* master select worker filter high load worker #2704
* master select worker filter high load worker #2704
* master select worker filter high load worker #2704
* add not worker log and remove worker invalid property
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* process definition json worker group convert #2794
* compatible old version host not port delete log file
Co-authored-by: qiaozhanwei <[email protected]>
---
.../apache/dolphinscheduler/service/process/ProcessService.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 6c4356f..36e2b60 100644
---
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -325,8 +325,15 @@ public class ProcessService {
if (StringUtils.isEmpty(taskInstance.getHost())){
continue;
}
- String ip = Host.of(taskInstance.getHost()).getIp();
int port = Constants.RPC_PORT;
+ String ip = "";
+ try {
+ ip = Host.of(taskInstance.getHost()).getIp();
+ }catch (Exception e){
+ // compatible old version
+ ip = taskInstance.getHost();
+ }
+
// remove task log from loggerserver
logClient.removeTaskLog(ip,port,taskLogPath);
