[incubator-inlong] branch master updated: [INLONG-4310][Manager] Change the manager plugin to adapt the sort entrance (#4313)

[he...@apache.org]

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

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 138be29d4 [INLONG-4310][Manager] Change the manager plugin to adapt the sort entrance (#4313)
138be29d4 is described below

commit 138be29d47805792f7c04468d4461ca2e5c17aa5
Author: jiancheng Lv <63...@qq.com>
AuthorDate: Mon May 23 20:36:16 2022 +0800

    [INLONG-4310][Manager] Change the manager plugin to adapt the sort entrance (#4313)
---
 inlong-distribution/distribution.xml                                  | 4 ++--
 .../java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java   | 2 +-
 .../java/org/apache/inlong/manager/plugin/flink/enums/Constants.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inlong-distribution/distribution.xml b/inlong-distribution/distribution.xml
index b1c34d892..c954b3f62 100644
--- a/inlong-distribution/distribution.xml
+++ b/inlong-distribution/distribution.xml
@@ -64,10 +64,10 @@
 
         <!-- package InLong-Sort-->
         <fileSet>
-            <directory>../inlong-sort/sort-single-tenant/target</directory>
+            <directory>../inlong-sort/sort-dist/target</directory>
             <outputDirectory>inlong-sort</outputDirectory>
             <includes>
-                <include>sort-single-tenant-${project.version}.jar</include>
+                <include>sort-dist-${project.version}.jar</include>
             </includes>
         </fileSet>
 
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java
index cb642322c..384202837 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java
@@ -43,7 +43,7 @@ public class FlinkOperation {
             + "or task already terminated or savepoint path is null";
     private static final String INLONG_MANAGER = "inlong-manager";
     private static final String INLONG_SORT = "inlong-sort";
-    private static final String SORT_JAR_PATTERN = "^sort-single-tenant.*jar$";
+    private static final String SORT_JAR_PATTERN = "^sort-dist.*jar$";
 
     private final FlinkService flinkService;
 
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java
index 97beea4af..b652644b9 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java
@@ -44,7 +44,7 @@ public class Constants {
 
     public static final String TYPE = "type";
 
-    public static final String ENTRYPOINT_CLASS = "org.apache.inlong.sort.singletenant.flink.Entrance";
+    public static final String ENTRYPOINT_CLASS = "org.apache.inlong.sort.Entrance";
 
     public static final String INLONG = "INLONG_";