Merge efe3336 into b3b8c07

ruanwenjun · web-flow · commit 967557ca5290 · 2024-04-25T08:13:44.000Z
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
@@ -183,11 +183,10 @@ public static boolean existTenantCodeInLinux(String tenantCode) {
      *
      * @param userName user name
      */
-    public static void createUserIfAbsent(String userName) {
+    public static synchronized void createUserIfAbsent(String userName) {
         // if not exists this user, then create
         if (!getUserList().contains(userName)) {
-            boolean isSuccess = createUser(userName);
-            log.info("create user {} {}", userName, isSuccess ? "success" : "fail");
+            createUser(userName);
         }
     }
 
@@ -197,13 +196,12 @@ public static void createUserIfAbsent(String userName) {
      * @param userName user name
      * @return true if creation was successful, otherwise false
      */
-    public static boolean createUser(String userName) {
+    public static void createUser(String userName) {
         try {
             String userGroup = getGroup();
             if (StringUtils.isEmpty(userGroup)) {
-                String errorLog = String.format("%s group does not exist for this operating system.", userGroup);
-                log.error(errorLog);
-                return false;
+                throw new UnsupportedOperationException(
+                        "There is no userGroup exist cannot create tenant, please create userGroupFirst");
             }
             if (SystemUtils.IS_OS_MAC) {
                 createMacUser(userName, userGroup);
@@ -212,18 +210,17 @@ public static boolean createUser(String userName) {
             } else {
                 createLinuxUser(userName, userGroup);
             }
-            return true;
+            log.info("Create tenant {} under userGroup: {} success", userName, userGroup);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            throw new RuntimeException("Create tenant: {} failed", e);
         }
 
-        return false;
     }
 
     /**
      * create linux user
      *
-     * @param userName user name
+     * @param userName  user name
      * @param userGroup user group
      * @throws IOException in case of an I/O error
      */
@@ -237,7 +234,7 @@ private static void createLinuxUser(String userName, String userGroup) throws IO
     /**
      * create mac user (Supports Mac OSX 10.10+)
      *
-     * @param userName user name
+     * @param userName  user name
      * @param userGroup user group
      * @throws IOException in case of an I/O error
      */
@@ -256,7 +253,7 @@ private static void createMacUser(String userName, String userGroup) throws IOEx
     /**
      * create windows user
      *
-     * @param userName user name
+     * @param userName  user name
      * @param userGroup user group
      * @throws IOException in case of an I/O error
      */
@@ -304,7 +301,7 @@ public static String getGroup() throws IOException {
      * get sudo command
      *
      * @param tenantCode tenantCode
-     * @param command command
+     * @param command    command
      * @return result of sudo execute command
      */
     public static String getSudoCmd(String tenantCode, String command) {
diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionContextUtils.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionContextUtils.java
@@ -78,7 +78,7 @@ public static String getOrCreateTenant(WorkerConfig workerConfig, TaskExecutionC
             throw ex;
         } catch (Exception ex) {
             throw new TaskException(
-                    String.format("TenantCode: %s doesn't exist", taskExecutionContext.getTenantCode()));
+                    String.format("TenantCode: %s doesn't exist", taskExecutionContext.getTenantCode()), ex);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static String getOrCreateTenant(WorkerConfig workerConfig, TaskExecutionC`
`78`	`78`	`throw ex;`
`79`	`79`	`} catch (Exception ex) {`
`80`	`80`	`throw new TaskException(`
`81`		`- String.format("TenantCode: %s doesn't exist", taskExecutionContext.getTenantCode()));`
	`81`	`+ String.format("TenantCode: %s doesn't exist", taskExecutionContext.getTenantCode()), ex);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`