You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/07 06:50:36 UTC
[incubator-linkis] 04/10: optimize start/install script
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 197c48035eb4a3ffa05c83a6ee91d8bd6efa11fb
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 03:05:22 2022 +0800
optimize start/install script
---
.../conf/linkis-ps-data-source-manager.properties | 2 +-
.../conf/linkis-ps-metadatamanager.properties | 2 +-
.../assembly-combined/sbin/common.sh | 2 +
.../sbin/ext/linkis-ps-data-source-manager | 4 +-
.../sbin/ext/linkis-ps-metadatamanager | 58 +++------------------
.../assembly-combined/sbin/linkis-start-all.sh | 60 +++++++++++++++-------
.../assembly-combined/sbin/linkis-stop-all.sh | 29 ++++++++---
assembly-combined-package/bin/install.sh | 13 ++++-
assembly-combined-package/deploy-config/db.sh | 9 +++-
.../deploy-config/linkis-env.sh | 36 +++++++------
10 files changed, 118 insertions(+), 97 deletions(-)
diff --git a/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties b/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties
index 0d374b0..b4f0d63 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties
@@ -31,7 +31,7 @@ hive.meta.password=
wds.linkis.metadata.hive.encode.enabled=false
##Spring
-spring.server.port=9106
+spring.server.port=9109
spring.spring.main.allow-bean-definition-overriding=true
spring.spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
diff --git a/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties b/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
index 1336c86..3a34831 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
@@ -18,4 +18,4 @@ wds.linkis.server.restful.scan.packages=org.apache.linkis.metadatamanager.server
wds.linkis.server.dsm.app.name=linkis-ps-data-source-manager
##Spring
-spring.server.port=8399
+spring.server.port=9110
diff --git a/assembly-combined-package/assembly-combined/sbin/common.sh b/assembly-combined-package/assembly-combined/sbin/common.sh
index 6d79a25..866d74b 100644
--- a/assembly-combined-package/assembly-combined/sbin/common.sh
+++ b/assembly-combined-package/assembly-combined/sbin/common.sh
@@ -17,6 +17,8 @@
#Actively load user env
source ~/.bash_profile
+source $LINKIS_CONF_DIR/linkis-env.sh
+
export local_host="`hostname --fqdn`"
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager
index 2b95cfa..200305b 100644
--- a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager
+++ b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# description: cs start cmd
+# description: data-source-manager start cmd
#
# Modified for Linkis 1.1.0
#
@@ -22,7 +22,7 @@
export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-data-source-manager"
-export DEBUG_PORT=10019
+#export DEBUG_PORT=
export SERVER_CLASS=org.apache.linkis.datasourcemanager.core.LinkisDataSourceManagerApplication
diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
index c6a666f..d7b78f6 100644
--- a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
+++ b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
@@ -13,63 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# description: cs start cmd
+# description: ps-metadatamanager start cmd
#
# Modified for Linkis 1.1.0
#
-source $LINKIS_CONF_DIR/linkis-env.sh
-
-SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadatamanager"
+export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadatamanager"
+#export DEBUG_PORT=
export SERVER_CLASS=org.apache.linkis.metadatamanager.server.LinkisMetadataManagerApplication
-export LINKIS_LOG_DIR=$LINKIS_HOME/logs
-if test -z "$SERVER_HEAP_SIZE"
-then
- export SERVER_HEAP_SIZE="512M"
-fi
-
-if [ "$DEBUG_PORT" ];
-then
- export DEBUG_CMD="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT"
-fi
-
-if test -z "$SERVER_JAVA_OPTS"
-then
- export SERVER_JAVA_OPTS=" -DserviceName=$SERVER_NAME -Xmx$SERVER_HEAP_SIZE -XX:+UseG1GC -Xloggc:$LINKIS_LOG_DIR/${SERVER_NAME}-gc.log $DEBUG_CMD "
-fi
-
-## conf dir
-export SERVER_CONF_PATH=$LINKIS_CONF_DIR
-
-## commons lib
-export LINKIS_COMMONS_LIB=$LINKIS_HOME/$LINKIS_PUBLIC_MODULE
-if [ ! -r "$LINKIS_COMMONS_LIB" ] ; then
- echo "linkis commons lib not exists $LINKIS_COMMONS_LIB"
- exit 1
-fi
-
-## server lib
-export SERVER_LIB=$LINKIS_HOME/lib/$SERVER_SUFFIX
-if [ ! -r "$SERVER_LIB" ] ; then
- echo "server lib not exists $SERVER_LIB"
- exit 1
-fi
-# set the wds.linkis.server.mdm.service.lib.dir to ${SERVER_LIB}/service
-SERVER_JAVA_OPTS=" -Dwds.linkis.server.mdm.service.lib.dir=${SERVER_LIB}/service"${SERVER_JAVA_OPTS}
-
-## set class path
-export SERVER_CLASS_PATH=$SERVER_CONF_PATH:$LINKIS_COMMONS_LIB/*:$SERVER_LIB/*
-
-nohup java $SERVER_JAVA_OPTS -cp $SERVER_CLASS_PATH $SERVER_CLASS $SPRING_ARGS 2>&1 > $LINKIS_LOG_DIR/${SERVER_NAME}.out &
-pid=$!
-sleep 2
-if [[ -z "${pid}" ]]; then
- echo "server $SERVER_NAME start failed!"
+export COMMON_START_BIN=$LINKIS_HOME/sbin/ext/linkis-common-start
+if [[ ! -f "${COMMON_START_BIN}" ]]; then
+ echo "The $COMMON_START_BIN does not exist!"
exit 1
else
- echo "server $SERVER_NAME start succeeded!"
- echo $pid > $SERVER_PID
-fi
+ sh $COMMON_START_BIN
+fi
\ No newline at end of file
diff --git a/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh b/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
index bf7520f..b48d251 100644
--- a/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
+++ b/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
@@ -58,18 +58,18 @@ sleep 3
}
-#eureka
+#linkis-mg-eureka
export SERVER_NAME="mg-eureka"
SERVER_IP=$EUREKA_INSTALL_IP
startApp
-#gateway
+#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
startApp
-#publicenservice
+#linkis-ps-publicservice
SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
startApp
@@ -77,7 +77,7 @@ startApp
-#manager
+#linkis-cg-linkismanage
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
startApp
@@ -85,27 +85,43 @@ startApp
sleep 15
-#cs-server
+#linkis-ps-cs
SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
startApp
-#entrnace
+#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
startApp
-#ecm
+#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
startApp
-#ecp
+#linkis-cg-engineplugin(ecp)
SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
startApp
+
+if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_IP
+ startApp
+
+ #linkis-ps-metadatamanager
+ SERVER_NAME="ps-metadatamanager"
+ SERVER_IP=$METADATA_MANAGER_PORT
+ startApp
+fi
+
+
+
+
echo "start-all shell script executed completely"
echo "Start to check all linkis microservice"
@@ -136,50 +152,58 @@ echo "<-------------------------------->"
sleep 3
}
-#eureka
+#linkis-mg-eureka
export SERVER_NAME="mg-eureka"
SERVER_IP=$EUREKA_INSTALL_IP
checkServer
-#gateway
+#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
checkServer
-#publicenhancements
+#linkis-ps-publicservice
SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
checkServer
-#cs-server
+#linkis-ps-cs
SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
checkServer
-#manager
+#linkis-cg-linkismanager
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
checkServer
-#entrnace
+#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
checkServer
-#ecm
+#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
checkServer
-#ecp
+#linkis-cg-engineplugin(ecp)
SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
checkServer
+if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_IP
+ checkServer
-
-
+ #linkis-ps-metadatamanager
+ SERVER_NAME="ps-metadatamanager"
+ SERVER_IP=$METADATA_MANAGER_IP
+ checkServer
+fi
echo "Linkis started successfully"
diff --git a/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh b/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
index e17030e..0054208 100644
--- a/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
+++ b/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
@@ -55,43 +55,56 @@ echo "<-------------------------------->"
-#gateway
+#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
stopApp
-#cs-server
+#linkis-ps-cs
SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
stopApp
-#ecm
+if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_IP
+ stopApp
+
+ #linkis-ps-metadatamanager
+ SERVER_NAME="ps-metadatamanager"
+ SERVER_IP=$METADATA_MANAGER_IP
+ stopApp
+fi
+
+
+#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
stopApp
-#entrnace
+#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
stopApp
-#ecp
+#linkis-cg-engineplugin(ecp)
SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
stopApp
-#publicservice
+#linkis-ps-publicservice
SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
stopApp
-#manager
+#linkis-cg-linkismanager
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
stopApp
-#eureka
+#linkis-mg-eureka
export SERVER_NAME="mg-eureka"
SERVER_IP=$EUREKA_INSTALL_IP
stopApp
diff --git a/assembly-combined-package/bin/install.sh b/assembly-combined-package/bin/install.sh
index d10f3d6..54056b9 100644
--- a/assembly-combined-package/bin/install.sh
+++ b/assembly-combined-package/bin/install.sh
@@ -357,9 +357,20 @@ then
sed -i ${txt} "s#spring.server.port.*#spring.server.port=$PUBLICSERVICE_PORT#g" $publicservice_conf
fi
+metadatamanage_conf=$LINKIS_HOME/conf/linkis-ps-metadatamanager.properties
+if [ "$METADATA_MANAGER_PORT" != "" ]
+then
+ sed -i ${txt} "s#spring.server.port.*#spring.server.port=$METADATA_MANAGER_PORT#g" $metadatamanage_conf
+fi
+
##datasource
-datasource_conf=$LINKIS_HOME/conf/linkis-ps-publicservice.properties
+datasource_conf=$LINKIS_HOME/conf/linkis-ps-data-source-manager.properties
+if [ "$DATASOURCE_MANAGER_PORT" != "" ]
+then
+ sed -i ${txt} "s#spring.server.port.*#spring.server.port=$DATASOURCE_MANAGER_PORT#g" $datasource_conf
+fi
+
echo "update conf $datasource_conf"
if [ "$HIVE_META_URL" != "" ]
then
diff --git a/assembly-combined-package/deploy-config/db.sh b/assembly-combined-package/deploy-config/db.sh
index 0d6ec69..2da3d5f 100644
--- a/assembly-combined-package/deploy-config/db.sh
+++ b/assembly-combined-package/deploy-config/db.sh
@@ -19,4 +19,11 @@ MYSQL_HOST=
MYSQL_PORT=
MYSQL_DB=
MYSQL_USER=
-MYSQL_PASSWORD=
\ No newline at end of file
+MYSQL_PASSWORD=
+
+
+### Provide the DB information of Hive metadata database.
+### Attention! If there are special characters like "&", they need to be enclosed in quotation marks.
+HIVE_META_URL=""
+HIVE_META_USER=""
+HIVE_META_PASSWORD=""
\ No newline at end of file
diff --git a/assembly-combined-package/deploy-config/linkis-env.sh b/assembly-combined-package/deploy-config/linkis-env.sh
index a5412db..a9b678b 100644
--- a/assembly-combined-package/deploy-config/linkis-env.sh
+++ b/assembly-combined-package/deploy-config/linkis-env.sh
@@ -45,12 +45,6 @@ ENGINECONN_ROOT_PATH=/appcom/tmp
### Path to store job ResultSet:file or hdfs path
RESULT_SET_ROOT_PATH=hdfs:///tmp/linkis ##hdfs:// required
-### Provide the DB information of Hive metadata database.
-### Attention! If there are special characters like "&", they need to be enclosed in quotation marks.
-HIVE_META_URL=""
-HIVE_META_USER=""
-HIVE_META_PASSWORD=""
-
##YARN REST URL spark engine required
YARN_RESTFUL_URL=http://127.0.0.1:8088
@@ -74,7 +68,7 @@ SPARK_CONF_DIR=/appcom/config/spark-config
#SPARK_VERSION
#SPARK_VERSION=2.4.3
##HIVE_VERSION
-#HIVE_VERSION=1.2.1
+#HIVE_VERSION=2.3.3
#PYTHON_VERSION=python2
################### The install Configuration of all Micro-Services #####################
@@ -92,36 +86,45 @@ SPARK_CONF_DIR=/appcom/config/spark-config
EUREKA_PORT=20303
export EUREKA_PREFER_IP=false
-### Gateway install information
+##linkis-mg-gateway
#GATEWAY_INSTALL_IP=127.0.0.1
GATEWAY_PORT=9001
-### ApplicationManager
+##linkis-cg-linkismanager
#MANAGER_INSTALL_IP=127.0.0.1
MANAGER_PORT=9101
-### EngineManager
+##linkis-cg-engineconnmanager
#ENGINECONNMANAGER_INSTALL_IP=127.0.0.1
ENGINECONNMANAGER_PORT=9102
-
-### EnginePluginServer
+##linkis-cg-engineplugin
#ENGINECONN_PLUGIN_SERVER_INSTALL_IP=127.0.0.1
ENGINECONN_PLUGIN_SERVER_PORT=9103
-### LinkisEntrance
+##linkis-cg-entrance
#ENTRANCE_INSTALL_IP=127.0.0.1
ENTRANCE_PORT=9104
-### publicservice
+##linkis-ps-publicservice
#PUBLICSERVICE_INSTALL_IP=127.0.0.1
PUBLICSERVICE_PORT=9105
-### cs
+##linkis-ps-cs
#CS_INSTALL_IP=127.0.0.1
CS_PORT=9108
+
+##linkis-ps-data-source-manager
+#DATASOURCE_MANAGER_IP=127.0.0.1
+DATASOURCE_MANAGER_PORT=9109
+
+##linkis-ps-metadatamanager
+#METADATA_MANAGER_IP=127.0.0.1
+METADATA_MANAGER_PORT=9110
+
+
########################################################################################
## LDAP is for enterprise authorization, if you just want to have a try, ignore it.
@@ -142,3 +145,6 @@ LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
## If SKYWALKING_AGENT_PATH is set, the Linkis components will be started with Skywalking agent
#SKYWALKING_AGENT_PATH=/appcom/config/skywalking-agent/skywalking-agent.jar
+
+#If you want to start metadata related microservices, you can set this export ENABLE_METADATA_MANAGE=true
+export ENABLE_METADATA_MANAGER=false
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org