From 0047df1e2977272b44e0d9650ffcb44ae70c1a8d Mon Sep 17 00:00:00 2001
From: yyuser5201314 <1727222589@qq.com>
Date: Sat, 2 Jul 2022 12:10:33 +0800
Subject: [PATCH 1/2] fix-bug #2389 Fixed the bug in the
 linkis-ps-metadataquery module that was missing after packaging

---
 linkis-dist/bin/checkEnv.sh                    |  2 +-
 linkis-dist/src/main/assembly/distribution.xml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/linkis-dist/bin/checkEnv.sh b/linkis-dist/bin/checkEnv.sh
index 04302bece0..61c49406c8 100644
--- a/linkis-dist/bin/checkEnv.sh
+++ b/linkis-dist/bin/checkEnv.sh
@@ -139,7 +139,7 @@ check_service_port
 SERVER_PORT=$DATASOURCE_MANAGER_PORT
 check_service_port
 
-SERVER_PORT=$METADATA_MANAGER_PORT
+SERVER_PORT=$METADATA_QUERY_PORT
 check_service_port
 
 if [ "$portIsOccupy" = true ];then
diff --git a/linkis-dist/src/main/assembly/distribution.xml b/linkis-dist/src/main/assembly/distribution.xml
index 56baf825b4..c6e1d555c4 100644
--- a/linkis-dist/src/main/assembly/distribution.xml
+++ b/linkis-dist/src/main/assembly/distribution.xml
@@ -6,9 +6,9 @@
   ~ 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.
@@ -290,13 +290,13 @@
                 <include>*.jar</include>
             </includes>
         </fileSet>
-        <!-- metadata manager -->
+        <!-- metadata query -->
         <fileSet>
             <directory>
-                ../linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/target/out/lib/
+                ../linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/target/out/lib/
             </directory>
             <outputDirectory>
-                linkis-package/lib/linkis-public-enhancements/linkis-ps-metadatamanager
+                linkis-package/lib/linkis-public-enhancements/linkis-ps-metadataquery
             </outputDirectory>
             <includes>
                 <include>**/*</include>
@@ -318,4 +318,4 @@
         </dependencySet>
     </dependencySets>
 
-</assembly>
\ No newline at end of file
+</assembly>

From 9aebee72a4e610eeb33a46e757e6aeccb682094e Mon Sep 17 00:00:00 2001
From: yyuser5201314 <1727222589@qq.com>
Date: Mon, 4 Jul 2022 11:44:56 +0800
Subject: [PATCH 2/2] fix-bug #2389 Fix the incorrect name of the
 linkis-ps-metadataquery module in the graceful-upgrade.sh

---
 linkis-dist/package/sbin/graceful-upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linkis-dist/package/sbin/graceful-upgrade.sh b/linkis-dist/package/sbin/graceful-upgrade.sh
index d5c2ddd485..233d86fb5f 100644
--- a/linkis-dist/package/sbin/graceful-upgrade.sh
+++ b/linkis-dist/package/sbin/graceful-upgrade.sh
@@ -60,8 +60,8 @@ function getPort(){
     "ps-data-source-manager")
       export SERVER_PORT=$DATASOURCE_MANAGER_PORT
       ;;
-    "ps-metadatamanager")
-      export SERVER_PORT=$METADATA_MANAGER_PORT
+    "ps-metadataquery")
+      export SERVER_PORT=$METADATA_QUERY_PORT
       ;;
   esac
 }