Set the tenant as the owner in final stage

apache · Dec 1, 2023 · 64ee4d6 · 64ee4d6
1 parent 71ee1f0
commit 64ee4d6
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 27 deletions.
diff --git a/...mmon/src/main/java/org/apache/dolphinscheduler/common/exception/FileOperateException.java b/...mmon/src/main/java/org/apache/dolphinscheduler/common/exception/FileOperateException.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.common.exception;
+
+public class FileOperateException extends BaseException {
+
+    public FileOperateException(String message) {
+        super(message);
+    }
+
+    public FileOperateException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/...hinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java b/...hinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java
@@ -25,6 +25,8 @@
 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 static String getFileChecksum(String pathName) throws IOException {
         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/...a/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java b/...a/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 @@ protected void generateShellScript() throws IOException {
         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/...main/java/org/apache/dolphinscheduler/plugin/task/api/shell/IShellInterceptorBuilder.java b/...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/...a/org/apache/dolphinscheduler/plugin/task/api/shell/bash/BashShellInterceptorBuilder.java b/...a/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 BashShellInterceptorBuilder newBuilder() {
     }
 
     @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/.../java/org/apache/dolphinscheduler/plugin/task/api/shell/sh/ShShellInterceptorBuilder.java b/.../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 ShShellInterceptorBuilder newBuilder() {
     }
 
     @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/.../main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java b/.../main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java
@@ -92,10 +92,6 @@ public static void createProcessLocalPathIfAbsent(TaskExecutionContext taskExecu
             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 static void downloadResourcesIfNeeded(StorageOperate storageOperate,
                     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));