This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new ef2e9c9b67 Set the tenant as the owner in final stage (#15256)
ef2e9c9b67 is described below
commit ef2e9c9b67e03b941ac3e8b6c2a77d4b1d564351
Author: Wenjun Ruan <[email protected]>
AuthorDate: Fri Dec 1 21:49:28 2023 +0800
Set the tenant as the owner in final stage (#15256)
---
.../common/exception/FileOperateException.java | 39 ++++--------------
.../dolphinscheduler/common/utils/FileUtils.java | 48 +++++++++++++++-------
.../shell/BaseLinuxShellInterceptorBuilder.java | 5 ++-
.../task/api/shell/IShellInterceptorBuilder.java | 4 +-
.../shell/bash/BashShellInterceptorBuilder.java | 3 +-
.../api/shell/sh/ShShellInterceptorBuilder.java | 3 +-
.../worker/utils/TaskExecutionCheckerUtils.java | 9 ----
7 files changed, 53 insertions(+), 58 deletions(-)
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/FileOperateException.java
similarity index 51%
copy from
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
copy to
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/FileOperateException.java
index cab50e3bdf..8099ebea73 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/FileOperateException.java
@@ -15,38 +15,15 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.plugin.task.api.shell;
+package org.apache.dolphinscheduler.common.exception;
-import java.io.IOException;
-import java.util.Map;
+public class FileOperateException extends BaseException {
-public interface IShellInterceptorBuilder<T extends
IShellInterceptorBuilder<T, Y>, Y extends IShellInterceptor> {
+ public FileOperateException(String message) {
+ super(message);
+ }
- T newBuilder();
-
- T newBuilder(T builder);
-
- T shellDirectory(String directory);
-
- T shellName(String shellFilename);
-
- T runUser(String systemUser);
-
- T cpuQuota(Integer cpuQuota);
-
- T memoryQuota(Integer memoryQuota);
-
- T appendSystemEnv(String envFiles);
-
- T appendCustomEnvScript(String customEnvScript);
-
- T k8sConfigYaml(String k8sConfigYaml);
-
- T properties(Map<String, String> propertyMap);
-
- T sudoMode(boolean sudoEnable);
-
- T appendScript(String script);
-
- Y build() throws IOException;
+ public FileOperateException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java
index abbfdbfcd3..a995b29dd6 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java
@@ -25,6 +25,8 @@ import static
org.apache.dolphinscheduler.common.constants.Constants.RESOURCE_VI
import static org.apache.dolphinscheduler.common.constants.Constants.UTF_8;
import static
org.apache.dolphinscheduler.common.constants.DateConstants.YYYYMMDDHHMMSS;
+import org.apache.dolphinscheduler.common.exception.FileOperateException;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SystemUtils;
@@ -323,23 +325,41 @@ public class FileUtils {
return crcString;
}
- public static void setFileOwner(Path filePath, String fileOwner) throws
InterruptedException, IOException {
- // We use linux command to set the file owner, since jdk api will not
use sudo.
- String command = String.format("sudo chown %s %s", fileOwner,
filePath.toString());
- Runtime.getRuntime().exec(command);
- Process process = Runtime.getRuntime().exec(command);
- if (0 != process.waitFor()) {
- throw new RuntimeException("Set file: " + filePath + " to owner: "
+ fileOwner + " failed");
+ public static void setFileOwner(Path filePath, String fileOwner) throws
FileOperateException {
+ try {
+ // We use linux command to set the file owner, since jdk api will
not use sudo.
+ String command = String.format("sudo chown %s %s", fileOwner,
filePath.toString());
+ Runtime.getRuntime().exec(command);
+ Process process = Runtime.getRuntime().exec(command);
+ int exitCode = process.waitFor();
+ if (0 != exitCode) {
+ throw new FileOperateException(
+ "Set file: " + filePath + " to owner: " + fileOwner +
" failed, existCode(" + exitCode + ")");
+ }
+ } catch (FileOperateException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ throw new FileOperateException("Set directory: " + filePath + " to
owner: " + fileOwner + " failed");
+
}
}
- public static void setDirectoryOwner(Path filePath, String fileOwner)
throws IOException, InterruptedException {
- // We use linux command to set the file owner, since jdk api will not
use sudo.
- String command = String.format("sudo chown -R %s %s", fileOwner,
filePath.toString());
- Runtime.getRuntime().exec(command);
- Process process = Runtime.getRuntime().exec(command);
- if (0 != process.waitFor()) {
- throw new RuntimeException("Set directory: " + filePath + " to
owner: " + fileOwner + " failed");
+ public static void setDirectoryOwner(Path filePath, String fileOwner)
throws FileOperateException {
+ try {
+ // We use linux command to set the file owner, since jdk api will
not use sudo.
+ String command = String.format("sudo chown -R %s %s", fileOwner,
filePath.toString());
+ Runtime.getRuntime().exec(command);
+ Process process = Runtime.getRuntime().exec(command);
+ int exitCode = process.waitFor();
+ if (0 != exitCode) {
+ throw new FileOperateException("Set directory: " + filePath +
" to owner: " + fileOwner
+ + " failed, existCode(" + exitCode + ")");
+ }
+ } catch (FileOperateException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ throw new FileOperateException("Set directory: " + filePath + " to
owner: " + fileOwner + " failed");
+
}
}
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java
index 5816681e75..3c24977c4a 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.plugin.task.api.shell;
+import org.apache.dolphinscheduler.common.exception.FileOperateException;
import org.apache.dolphinscheduler.common.utils.FileUtils;
import org.apache.dolphinscheduler.common.utils.PropertyUtils;
import
org.apache.dolphinscheduler.plugin.task.api.utils.AbstractCommandExecutorConstants;
@@ -64,8 +65,10 @@ public abstract class BaseLinuxShellInterceptorBuilder<T
extends BaseLinuxShellI
log.info("Final Shell file is : \n{}", finalScript);
}
- protected List<String> generateBootstrapCommand() {
+ protected List<String> generateBootstrapCommand() throws
FileOperateException {
if (sudoEnable) {
+ // Set the tenant owner as the working directory
+ FileUtils.setDirectoryOwner(Paths.get(shellDirectory), runUser);
return bootstrapCommandInSudoMode();
}
return bootstrapCommandInNormalMode();
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
index cab50e3bdf..8e6cf5c42f 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java
@@ -17,6 +17,8 @@
package org.apache.dolphinscheduler.plugin.task.api.shell;
+import org.apache.dolphinscheduler.common.exception.FileOperateException;
+
import java.io.IOException;
import java.util.Map;
@@ -48,5 +50,5 @@ public interface IShellInterceptorBuilder<T extends
IShellInterceptorBuilder<T,
T appendScript(String script);
- Y build() throws IOException;
+ Y build() throws IOException, InterruptedException, FileOperateException;
}
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/bash/BashShellInterceptorBuilder.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/bash/BashShellInterceptorBuilder.java
index 15ffd2cc88..48b3e175f2 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/bash/BashShellInterceptorBuilder.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/bash/BashShellInterceptorBuilder.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.plugin.task.api.shell.bash;
+import org.apache.dolphinscheduler.common.exception.FileOperateException;
import
org.apache.dolphinscheduler.plugin.task.api.shell.BaseLinuxShellInterceptorBuilder;
import java.io.IOException;
@@ -32,7 +33,7 @@ public class BashShellInterceptorBuilder
}
@Override
- public BashShellInterceptor build() throws IOException {
+ public BashShellInterceptor build() throws FileOperateException,
IOException {
generateShellScript();
List<String> bootstrapCommand = generateBootstrapCommand();
return new BashShellInterceptor(bootstrapCommand, shellDirectory);
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/sh/ShShellInterceptorBuilder.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/sh/ShShellInterceptorBuilder.java
index 8f15b543d0..c74551b6c1 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/sh/ShShellInterceptorBuilder.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/sh/ShShellInterceptorBuilder.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.plugin.task.api.shell.sh;
+import org.apache.dolphinscheduler.common.exception.FileOperateException;
import
org.apache.dolphinscheduler.plugin.task.api.shell.BaseLinuxShellInterceptorBuilder;
import java.io.IOException;
@@ -32,7 +33,7 @@ public class ShShellInterceptorBuilder
}
@Override
- public ShShellInterceptor build() throws IOException {
+ public ShShellInterceptor build() throws IOException, FileOperateException
{
generateShellScript();
List<String> bootstrapCommand = generateBootstrapCommand();
return new ShShellInterceptor(bootstrapCommand, shellDirectory);
diff --git
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java
index 322e16bc2b..195e4d3a0a 100644
---
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java
+++
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java
@@ -92,10 +92,6 @@ public class TaskExecutionCheckerUtils {
taskExecutionContext.setAppInfoPath(FileUtils.getAppInfoPath(execLocalPath));
Path executePath =
Paths.get(taskExecutionContext.getExecutePath());
FileUtils.createDirectoryIfNotPresent(executePath);
- if (OSUtils.isSudoEnable()
- &&
!TenantConstants.DEFAULT_TENANT_CODE.equals(taskExecutionContext.getTenantCode()))
{
- FileUtils.setDirectoryOwner(executePath,
taskExecutionContext.getTenantCode());
- }
} catch (Throwable ex) {
throw new TaskException("Cannot create process execute dir", ex);
}
@@ -136,11 +132,6 @@ public class TaskExecutionCheckerUtils {
Path localFileAbsolutePath = Paths.get(execLocalPath,
fileName);
storageOperate.download(actualTenant, fullName,
localFileAbsolutePath.toString(), true);
log.info("Download resource file {} under: {}
successfully", fileName, localFileAbsolutePath);
- if (OSUtils.isSudoEnable() &&
!TenantConstants.DEFAULT_TENANT_CODE.equals(tenant)) {
- FileUtils.setFileOwner(localFileAbsolutePath,
taskExecutionContext.getTenantCode());
- log.info("Set file {} owner to {} successfully",
localFileAbsolutePath,
- taskExecutionContext.getTenantCode());
- }
WorkerServerMetrics
.recordWorkerResourceDownloadTime(System.currentTimeMillis() -
resourceDownloadStartTime);
WorkerServerMetrics.recordWorkerResourceDownloadSize(Files.size(localFileAbsolutePath));
