(incubator-streampark) branch yarn-app updated: [Bug] upload job to workspace bug fixed

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch yarn-app
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/yarn-app by this push:
     new f5b98d9b4 [Bug] upload job to workspace bug fixed
f5b98d9b4 is described below

commit f5b98d9b48f47742234f85b73b8c063ec0c2d3f3
Author: benjobs <benj...@apache.org>
AuthorDate: Thu Nov 9 08:35:49 2023 +0800

    [Bug] upload job to workspace bug fixed
---
 .../core/service/impl/AppBuildPipeServiceImpl.java      | 17 +++++++----------
 .../core/service/impl/ApplicationServiceImpl.java       | 11 +----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
index 41d451335..6accb452b 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
@@ -381,8 +381,7 @@ public class AppBuildPipeServiceImpl
             throw new ApiAlertException("Missing file: " + jar + ", please 
upload again");
           }
           if (localJar.exists()) {
-            checkOrElseUploadJar(
-                FsOperator.lfs(), localJar, uploadJar.getAbsolutePath(), 
localUploadDIR);
+            checkOrElseUploadJar(FsOperator.lfs(), localJar, uploadJar, 
localUploadDIR);
           }
         }
       }
@@ -394,13 +393,11 @@ public class AppBuildPipeServiceImpl
       if (app.isUploadJob()) {
 
         // 1). upload jar to local upload.
+        File localJar = new File(WebUtils.getAppTempDir(), app.getJar());
+
         File uploadJar = new File(localUploadDIR, app.getJar());
 
-        checkOrElseUploadJar(
-            FsOperator.lfs(),
-            new File(WebUtils.getAppTempDir(), app.getJar()),
-            uploadJar.getAbsolutePath(),
-            localUploadDIR);
+        checkOrElseUploadJar(FsOperator.lfs(), localJar, uploadJar, 
localUploadDIR);
 
         if (app.getExecutionModeEnum() == ExecutionMode.YARN_APPLICATION) {
           List<File> jars = new ArrayList<>(0);
@@ -510,12 +507,12 @@ public class AppBuildPipeServiceImpl
   }
 
   private void checkOrElseUploadJar(
-      FsOperator fsOperator, File localJar, String targetJar, File targetDir) {
-    if (!fsOperator.exists(targetJar)) {
+      FsOperator fsOperator, File localJar, File targetJar, File targetDir) {
+    if (!fsOperator.exists(targetJar.getAbsolutePath())) {
       fsOperator.upload(localJar.getAbsolutePath(), 
targetDir.getAbsolutePath(), false, true);
     } else {
       // The file exists to check whether it is consistent, and if it is 
inconsistent, re-upload it
-      if (!FileUtils.equals(localJar, new File(targetJar))) {
+      if (!FileUtils.equals(localJar, targetJar)) {
         fsOperator.upload(localJar.getAbsolutePath(), 
targetDir.getAbsolutePath(), false, true);
       }
     }
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
index f86cb2628..63e814101 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
@@ -704,16 +704,7 @@ public class ApplicationServiceImpl extends 
ServiceImpl<ApplicationMapper, Appli
     ApiAlertException.throwIfNull(
         appParam.getTeamId(), "The teamId can't be null. Create application 
failed.");
 
-    if (appParam.isFlinkSqlJob()) {
-      appParam.setBuild(true);
-    } else {
-      if (appParam.isUploadJob()) {
-        appParam.setBuild(!appParam.getDependencyObject().isEmpty());
-      } else {
-        appParam.setBuild(false);
-      }
-    }
-
+    appParam.setBuild(true);
     appParam.setUserId(commonService.getUserId());
     appParam.setState(FlinkAppState.ADDED.getValue());
     appParam.setRelease(ReleaseState.NEED_RELEASE.get());