You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/09/17 03:31:03 UTC
[dolphinscheduler] branch 3.0.1-prepare updated: Clear thread name in BaseTaskProcessor (#11422) (#12008)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch 3.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.0.1-prepare by this push:
new 36135d4151 Clear thread name in BaseTaskProcessor (#11422) (#12008)
36135d4151 is described below
commit 36135d415121dba9eb480c746e483fa1c13815c8
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Sat Sep 17 11:30:57 2022 +0800
Clear thread name in BaseTaskProcessor (#11422) (#12008)
(cherry picked from commit 47b50067ef26b599a7a1a47594c0c393fddcdfd0)
---
.../master/runner/task/BaseTaskProcessor.java | 48 +++++++++++++---------
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java
index 4a91d8d7dc..297e2040b7 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java
@@ -63,7 +63,6 @@ import org.apache.dolphinscheduler.spi.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -168,25 +167,36 @@ public abstract class BaseTaskProcessor implements ITaskProcessor {
if (StringUtils.isNotEmpty(threadLoggerInfoName)) {
Thread.currentThread().setName(threadLoggerInfoName);
}
- switch (taskAction) {
- case STOP:
- return stop();
- case PAUSE:
- return pause();
- case TIMEOUT:
- return timeout();
- case SUBMIT:
- return submit();
- case RUN:
- return run();
- case DISPATCH:
- return dispatch();
- default:
- logger.error("unknown task action: {}", taskAction);
+ boolean result = false;
+ try {
+ switch (taskAction) {
+ case STOP:
+ result = stop();
+ break;
+ case PAUSE:
+ result = pause();
+ break;
+ case TIMEOUT:
+ result = timeout();
+ break;
+ case SUBMIT:
+ result = submit();
+ break;
+ case RUN:
+ result = run();
+ break;
+ case DISPATCH:
+ result = dispatch();
+ break;
+ default:
+ logger.error("unknown task action: {}", taskAction);
+ }
+ return result;
+ } finally {
+ // reset thread name
+ Thread.currentThread().setName(threadName);
+
}
- // reset thread name
- Thread.currentThread().setName(threadName);
- return false;
}
protected boolean submit() {