[incubator-seatunnel] branch dev updated: [Hotfix][SeaTunnel-Engine][Log] fix log show problem (#3118)

[tyrantlucifer]

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

tyrantlucifer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new 0fd8da9c1 [Hotfix][SeaTunnel-Engine][Log] fix log show problem (#3118)
0fd8da9c1 is described below

commit 0fd8da9c1c414576dc4f9a164e3b862639f23965
Author: Hisoka <fanjiaemi...@qq.com>
AuthorDate: Tue Oct 18 00:20:14 2022 +0800

    [Hotfix][SeaTunnel-Engine][Log] fix log show problem (#3118)
---
 .../core/starter/seatunnel/command/ClientExecuteCommand.java        | 6 +++---
 .../seatunnel/engine/server/service/slot/DefaultSlotService.java    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
 
b/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
index cc8bd3238..938ca8f97 100644
--- 
a/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
+++ 
b/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
@@ -73,12 +73,12 @@ public class ClientExecuteCommand implements 
Command<ClientCommandArgs> {
         } catch (ExecutionException | InterruptedException e) {
             throw new CommandExecuteException("SeaTunnel job executed failed", 
e);
         } finally {
-            if (instance != null) {
-                instance.shutdown();
-            }
             if (clientJobProxy != null) {
                 clientJobProxy.close();
             }
+            if (instance != null) {
+                instance.shutdown();
+            }
         }
     }
 
diff --git 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/service/slot/DefaultSlotService.java
 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/service/slot/DefaultSlotService.java
index e85cff0b9..75b692302 100644
--- 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/service/slot/DefaultSlotService.java
+++ 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/service/slot/DefaultSlotService.java
@@ -95,7 +95,6 @@ public class DefaultSlotService implements SlotService {
                     nodeEngine.getClusterService().getThisAddress());
                 sendToMaster(new 
WorkerHeartbeatOperation(toWorkerProfile())).join();
             } catch (Exception e) {
-                LOGGER.warning(e);
                 LOGGER.warning("failed send heartbeat to resource manager, 
will retry later. this address: " +
                     nodeEngine.getClusterService().getThisAddress());
             }