You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ja...@apache.org on 2020/09/09 14:10:35 UTC
[incubator-dolphinscheduler] branch dev updated: [Bug][server] fix
3629 pull request (#3706)
This is an automated email from the ASF dual-hosted git repository.
jave pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 4ed3638 [Bug][server] fix 3629 pull request (#3706)
4ed3638 is described below
commit 4ed36387507c50b1042802143676a04fc51e6bcc
Author: felix.wang <59...@users.noreply.github.com>
AuthorDate: Wed Sep 9 22:09:49 2020 +0800
[Bug][server] fix 3629 pull request (#3706)
* fix 3629 pr
* fix e2e build
---
.github/workflows/ci_e2e.yml | 2 +-
.../main/java/org/apache/dolphinscheduler/server/utils/LogUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci_e2e.yml b/.github/workflows/ci_e2e.yml
index 7f5fc8a..8070d7e 100644
--- a/.github/workflows/ci_e2e.yml
+++ b/.github/workflows/ci_e2e.yml
@@ -59,7 +59,7 @@ jobs:
sudo dpkg -i google-chrome*.deb
sudo apt-get install -f -y
google-chrome -version
- googleVersion=`google-chrome -version | awk '{print $3}'`
+ googleVersion=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
wget -N https://chromedriver.storage.googleapis.com/${googleVersion}/chromedriver_linux64.zip
unzip chromedriver_linux64.zip
sudo mv -f chromedriver /usr/local/share/chromedriver
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LogUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LogUtils.java
index 93008b9..bb8ddc8 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LogUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LogUtils.java
@@ -70,7 +70,7 @@ public class LogUtils {
* get task log path by TaskExecutionContext
*/
public static String getTaskLogPath(TaskExecutionContext taskExecutionContext) {
- return getTaskLogPath(taskExecutionContext.getProcessId(), taskExecutionContext.getProcessInstanceId(), taskExecutionContext.getTaskInstanceId());
+ return getTaskLogPath(taskExecutionContext.getProcessDefineId(), taskExecutionContext.getProcessInstanceId(), taskExecutionContext.getTaskInstanceId());
}
}