You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/07/12 11:55:41 UTC
[inlong] branch master updated: [INLONG-5009][Docker] Fix dataproxy-docker script judgement (#5010)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 4b4836d85 [INLONG-5009][Docker] Fix dataproxy-docker script judgement (#5010)
4b4836d85 is described below
commit 4b4836d85820186dee0babc59f2414c0a9dd5322
Author: Lucas <10...@users.noreply.github.com>
AuthorDate: Tue Jul 12 19:55:34 2022 +0800
[INLONG-5009][Docker] Fix dataproxy-docker script judgement (#5010)
---
bin/inlong-daemon | 12 ++++++------
inlong-audit/audit-docker/audit-docker.sh | 10 +++++-----
inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh | 4 ++--
inlong-tubemq/tubemq-docker/tubemq-all/tubemq-docker.sh | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/bin/inlong-daemon b/bin/inlong-daemon
index 6410a00da..646a42b70 100644
--- a/bin/inlong-daemon
+++ b/bin/inlong-daemon
@@ -74,10 +74,10 @@ start_inlong_audit() {
mysql -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} <sql/apache_inlong_audit.sql
fi
echo "start audit proxy"
- if [ $mq_type == "pulsar" ]; then
+ if [ "${mq_type}" = "pulsar" ]; then
bash +x ./bin/proxy-start.sh pulsar
fi
- if [ $mq_type == "tubemq" ]; then
+ if [ "${mq_type}" = "tubemq" ]; then
bash +x ./bin/proxy-start.sh tube
fi
echo "start audit store"
@@ -105,7 +105,7 @@ start_inlong_manager() {
start_inlong_dashboard() {
echo "start dashboard"
- if [[ "$manager_server_hostname" == "localhost" || "$manager_server_hostname" == "127.0.0.1" ]]; then
+ if [[ "${manager_server_hostname}" = "localhost" || "${manager_server_hostname}" = "127.0.0.1" ]]; then
manager_server_hostname=$local_ip
fi
docker run -d --name dashboard -e MANAGER_API_ADDRESS=${local_ip}:${manager_server_port} -p ${dashboard_mapping_port}:80 ${dashboard_docker_image}
@@ -115,10 +115,10 @@ start_inlong_dataproxy() {
init_compo
echo "start dataproxy"
cd $INLONG_HOME/inlong-dataproxy
- if [ $mq_type == "pulsar" ]; then
+ if [ "${mq_type}" = "pulsar" ]; then
bash +x ./bin/dataproxy-start.sh pulsar
fi
- if [ $mq_type == "tubemq" ]; then
+ if [ "${mq_type}" = "tubemq" ]; then
bash +x ./bin/dataproxy-start.sh tube
fi
# wait to start
@@ -195,7 +195,7 @@ stop_inlong_all() {
stop_inlong_manager
}
-if [[ "$COMMAND" == start || "$COMMAND" == stop ]]; then
+if [[ "${COMMAND}" = start || "${COMMAND}" = stop ]]; then
case $SERVICE in
manager | dashboard | dataproxy | agent | audit)
${COMMAND}_inlong_${SERVICE}
diff --git a/inlong-audit/audit-docker/audit-docker.sh b/inlong-audit/audit-docker/audit-docker.sh
index 6ec614623..c7ff207b2 100755
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-docker.sh
@@ -28,12 +28,12 @@ sed -i "s/spring.datasource.druid.username=.*$/spring.datasource.druid.username=
sed -i "s/spring.datasource.druid.password=.*$/spring.datasource.druid.password=${PASSWORD}/g" "${store_conf_file}"
# replace the configuration for audit proxy
-if [[ "${MQ_TYPE}" == "pulsar" ]]; then
+if [ "${MQ_TYPE}" = "pulsar" ]; then
sed -i "s/audit.pulsar.server.url=.*$/audit.pulsar.server.url=pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${store_conf_file}"
sed -i "s/agent1.sinks.pulsar-sink-msg1.pulsar_server_url = .*$/agent1.sinks.pulsar-sink-msg1.pulsar_server_url = pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"
sed -i "s/agent1.sinks.pulsar-sink-msg2.pulsar_server_url = .*$/agent1.sinks.pulsar-sink-msg2.pulsar_server_url = pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"
fi
-if [[ "${MQ_TYPE}" == "tubemq" ]]; then
+if [ "${MQ_TYPE}" = "tubemq" ]; then
sed -i "s/audit.tube.masterlist=.*$/audit.tube.masterlist=${TUBE_MASTER_LIST}/g" "${store_conf_file}"
sed -i "s/agent1.sinks.tube-sink-msg1.master-host-port-list = .*$/agent1.sinks.tube-sink-msg1.master-host-port-list = ${TUBE_MASTER_LIST}/g" "${proxy_conf_file}"
sed -i "s/agent1.sinks.tube-sink-msg2.master-host-port-list = .*$/agent1.sinks.tube-sink-msg2.master-host-port-list = ${TUBE_MASTER_LIST}/g" "${proxy_conf_file}"
@@ -47,17 +47,17 @@ if [[ "${JDBC_URL}" =~ (.+):([0-9]+) ]]; then
select_db_sql="SELECT COUNT(*) FROM information_schema.TABLES WHERE table_schema = 'apache_inlong_audit'"
inlong_audit_count=$(mysql -h${datasource_hostname} -P${datasource_port} -u${USERNAME} -p${PASSWORD} -e "${select_db_sql}")
inlong_num=$(echo "$inlong_audit_count" | tr -cd "[0-9]")
- if [[ $inlong_num == 0 ]]; then
+ if [ "${inlong_num}" = 0 ]; then
mysql -h${datasource_hostname} -P${datasource_port} -u${USERNAME} -p${PASSWORD} < sql/apache_inlong_audit.sql
fi
fi
# start proxy
cd "${file_path}/"
-if [[ "${MQ_TYPE}" == "pulsar" ]]; then
+if [ "${MQ_TYPE}" = "pulsar" ]; then
bash +x ./bin/proxy-start.sh pulsar
fi
-if [[ "${MQ_TYPE}" == "tubemq" ]]; then
+if [ "${MQ_TYPE}" = "tubemq" ]; then
bash +x ./bin/proxy-start.sh tube
fi
# start store
diff --git a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
index 421948e66..cc19097e3 100644
--- a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
+++ b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
@@ -24,10 +24,10 @@ sed -i "s/manager.hosts=.*$/manager.hosts=${MANAGER_OPENAPI_IP}:${MANAGER_OPENAP
sed -i "s/audit.proxys=.*$/audit.proxys=${AUDIT_PROXY_URL}/g" "${common_conf_file}"
# start
-if [ $MQ_TYPE == "pulsar" ]; then
+if [ "${MQ_TYPE}" = "pulsar" ]; then
bash +x ./bin/dataproxy-start.sh pulsar
fi
-if [ $MQ_TYPE == "tubemq" ]; then
+if [ "${MQ_TYPE}" = "tubemq" ]; then
bash +x ./bin/dataproxy-start.sh tube
fi
diff --git a/inlong-tubemq/tubemq-docker/tubemq-all/tubemq-docker.sh b/inlong-tubemq/tubemq-docker/tubemq-all/tubemq-docker.sh
index d1696711e..f503641e9 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-all/tubemq-docker.sh
+++ b/inlong-tubemq/tubemq-docker/tubemq-all/tubemq-docker.sh
@@ -35,7 +35,7 @@ else
sed -i 's/useWebProxy=.*/useWebProxy=false/g' /opt/tubemq-server/conf/master.ini
fi
# for standalone, start all services
-if [[ $TARGET == "standalone" ]]; then
+if [ "${TARGET}" = "standalone" ]; then
# zookeeper start
/docker-entrypoint.sh zkServer.sh start
wait_port_to_listen zookeeper 2181
@@ -55,12 +55,12 @@ if [[ $TARGET == "standalone" ]]; then
tail -F /opt/tubemq-server/logs/*
fi
# for master
-if [[ $TARGET == "master" ]]; then
+if [ "${TARGET}" = "master" ]; then
./tubemq.sh master start
tail -F /opt/tubemq-server/logs/master.log
fi
# for broker
-if [[ $TARGET == "broker" ]]; then
+if [ "${TARGET}" = "broker" ]; then
./tubemq.sh broker start
tail -F /opt/tubemq-server/logs/broker.log
fi
\ No newline at end of file