Skip to content

Commit 390ae7c

Browse files
authored
Merge pull request #4 from WeBankFinTech/master
拉代码
2 parents 915d156 + a486da6 commit 390ae7c

File tree

36 files changed

+410
-218
lines changed

36 files changed

+410
-218
lines changed

README-ZH.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,17 @@ DSS主要特点:
127127

128128
           **根据需要,用户可以简单快速替换DSS已集成的各种功能组件,或新增功能组件。**
129129

130+
## Demo试用环境
131+
132+
       由于DataSphereStudio支持执行脚本风险较高,WeDataSphere Demo环境的隔离没有做完,考虑到大家都在咨询Demo环境,决定向社区先定向发放邀请码,接受企业和组织的试用申请。
133+
134+
       如果您想试用Demo环境,请加入DataSphere Studio社区用户群(**加群方式请翻到本文档末尾处**),联系团队成员获取邀请码。
135+
136+
       WeDataSphere Demo环境用户注册页面:https://sandbox.webank.com/wds/dss/#/register
137+
138+
       WeDataSphere Demo环境登录页面:https://sandbox.webank.com/wds/dss/
139+
140+
       我们会尽快解决环境隔离问题,争取早日向社区完全开放WeDataSphere Demo环境。
130141

131142
## 与类似系统对比
132143

assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.6.0</version>
25+
<version>0.7.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

bin/checkEnv.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ need_cmd mysql
3939
need_cmd unzip
4040
need_cmd expect
4141
need_cmd telnet
42-
need_cmd sed
4342
need_cmd tar
44-
need_cmd source
45-
need_cmd hostname
43+
need_cmd sed
44+
need_cmd dos2unix
4645
echo "<-----end to check linux cmd:yum java mysql unzip expect telnet sed tar------>"

bin/checkMicro.sh

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
# Copyright 2019 WeBank
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
#!/bin/sh
17+
source ~/.bash_profile
18+
19+
shellDir=`dirname $0`
20+
workDir=`cd ${shellDir}/..;pwd`
21+
22+
##load config
23+
source ${workDir}/conf/config.sh
24+
source ${workDir}/conf/db.sh
25+
26+
MICRO_SERVICE_NAME=$1
27+
MICRO_SERVICE_IP=$2
28+
MICRO_SERVICE_PORT=$3
29+
echo "<--------------------------------------------------------------------------->"
30+
echo "Start to Check if your microservice:$MICRO_SERVICE_NAME is normal via telnet"
31+
echo ""
32+
if [ ! -d $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME ];then
33+
echo "$MICRO_SERVICE_NAME is not installed,the check steps will be skipped"
34+
exit 0
35+
fi
36+
37+
result=`echo -e "\n" | telnet $MICRO_SERVICE_IP $MICRO_SERVICE_PORT 2>/dev/null | grep Connected | wc -l`
38+
if [ $result -eq 1 ]; then
39+
echo "$MICRO_SERVICE_NAME is ok."
40+
else
41+
echo "<--------------------------------------------------------------------------->"
42+
echo "ERROR your $MICRO_SERVICE_NAME microservice is not start successful !!! ERROR logs as follows :"
43+
echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
44+
echo '<------------------------------------------------------------->'
45+
tail -n 50 $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/*.out
46+
echo '<-------------------------------------------------------------->'
47+
echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
48+
exit 1
49+
fi
50+

bin/install.sh

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ elif [[ "$OSTYPE" == "win32" ]]; then
3737
echo "dss not support Windows operating system"
3838
exit 1
3939
elif [[ "$OSTYPE" == "freebsd"* ]]; then
40-
4140
txt=""
4241
else
4342
echo "Operating system unknown, please tell us(submit issue) for better service"
@@ -46,14 +45,13 @@ fi
4645

4746
function isSuccess(){
4847
if [ $? -ne 0 ]; then
49-
echo "Failed to " + $1
48+
echo "ERROR to " + $1
5049
exit 1
5150
else
52-
echo "Succeed to" + $1
51+
echo "SUCESS to" + $1
5352
fi
5453
}
5554

56-
5755
#check env
5856
sh ${workDir}/bin/checkEnv.sh
5957
isSuccess "check env"
@@ -74,63 +72,46 @@ else
7472
fi
7573
}
7674

77-
function checkPythonAndJava(){
78-
python --version
79-
isSuccess "execute python --version"
80-
java -version
81-
isSuccess "execute java --version"
82-
}
83-
84-
function checkHadoopAndHive(){
85-
hdfs version
86-
isSuccess "execute hdfs version"
87-
hive --help
88-
#isSuccess "execute hive -h"
89-
}
90-
91-
function checkSpark(){
92-
spark-submit --version
93-
isSuccess "execute spark-submit --version"
94-
}
95-
96-
##install env:expect,
97-
sudo yum install -y expect
98-
isSuccess "install expect"
99-
100-
##install env:telnet,
101-
sudo yum install -y telnet
102-
isSuccess "install telnet"
103-
10475
##load config
10576
echo "step1:load config"
10677
source ${workDir}/conf/config.sh
10778
source ${workDir}/conf/db.sh
10879
isSuccess "load config"
10980

110-
local_host="`hostname --fqdn`"
81+
local_host="`hostname -i`"
11182

11283
##env check
11384
echo "Please enter the mode selection such as: 1"
114-
echo " 1: Simple"
115-
echo " 2: Standard"
85+
echo " 1: lite"
86+
echo " 2: sample"
87+
echo " 3: Standard"
11688
echo ""
11789

11890
INSTALL_MODE=1
11991

12092
read -p "Please input the choice:" idx
12193
if [[ '1' = "$idx" ]];then
12294
INSTALL_MODE=1
123-
echo "You chose Simple installation mode"
95+
echo "You chose lite installation mode"
12496
#check for Java
12597
checkJava
12698
#check for mysql
12799
SERVER_NAME=MYSQL
128100
EXTERNAL_SERVER_IP=$MYSQL_HOST
129101
EXTERNAL_SERVER_PORT=$MYSQL_PORT
130102
checkExternalServer
131-
132103
elif [[ '2' = "$idx" ]];then
133104
INSTALL_MODE=2
105+
echo "You chose sample installation mode"
106+
#check for Java
107+
checkJava
108+
#check for mysql
109+
SERVER_NAME=MYSQL
110+
EXTERNAL_SERVER_IP=$MYSQL_HOST
111+
EXTERNAL_SERVER_PORT=$MYSQL_PORT
112+
113+
elif [[ '3' = "$idx" ]];then
114+
INSTALL_MODE=3
134115
echo "You chose Standard installation mode"
135116
#check for Java
136117
checkJava
@@ -155,8 +136,8 @@ else
155136
exit 1
156137
fi
157138

158-
##env check
159-
echo "Do you want to clear Dss table information in the database?"
139+
##init db
140+
echo "Do you want to clear DSS table information in the database?"
160141
echo " 1: Do not execute table-building statements"
161142
echo " 2: Dangerous! Clear all data and rebuild the tables."
162143
echo ""
@@ -189,18 +170,25 @@ if [[ '2' = "$MYSQL_INSTALL_MODE" ]];then
189170
#echo $GATEWAY_INSTALL_IP_2
190171
sed -i "s/GATEWAY_INSTALL_IP_2/$GATEWAY_INSTALL_IP_2/g" ${workDir}/db/dss_dml.sql
191172
sed -i "s/GATEWAY_PORT/$GATEWAY_PORT/g" ${workDir}/db/dss_dml.sql
192-
if [ $VISUALIS_NGINX_IP == "127.0.0.1" ]||[ $VISUALIS_NGINX_IP == "0.0.0.0" ];then
173+
mysql -h$MYSQL_HOST -P$MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD -D$MYSQL_DB --default-character-set=utf8 -e "source ${workDir}/db/dss_dml.sql"
174+
isSuccess "source dss_dml.sql"
175+
176+
if [ '2' = "$INSTALL_MODE" ]||[ '3' = "$INSTALL_MODE" ];then
177+
echo "visualis support "
178+
if [ $VISUALIS_NGINX_IP == "127.0.0.1" ]||[ $VISUALIS_NGINX_IP == "0.0.0.0" ];then
193179
echo "VISUALIS_NGINX_IP is equals $VISUALIS_NGINX_IP ,we will change it to ip address"
194180
VISUALIS_NGINX_IP_2=$LOCAL_IP
195-
else
181+
else
196182
VISUALIS_NGINX_IP_2=$VISUALIS_NGINX_IP
183+
fi
184+
#echo $VISUALIS_NGINX_IP_2
185+
sed -i "s/VISUALIS_NGINX_IP_2/$VISUALIS_NGINX_IP_2/g" ${workDir}/db/visualis.sql
186+
sed -i "s/VISUALIS_NGINX_PORT/$VISUALIS_NGINX_PORT/g" ${workDir}/db/visualis.sql
187+
mysql -h$MYSQL_HOST -P$MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD -D$MYSQL_DB --default-character-set=utf8 -e "source ${workDir}/db/visualis.sql"
188+
isSuccess "source visualis.sql"
197189
fi
198-
#echo $VISUALIS_NGINX_IP_2
199-
sed -i "s/VISUALIS_NGINX_IP_2/$VISUALIS_NGINX_IP_2/g" ${workDir}/db/dss_dml.sql
200-
sed -i "s/VISUALIS_NGINX_PORT/$VISUALIS_NGINX_PORT/g" ${workDir}/db/dss_dml.sql
201-
mysql -h$MYSQL_HOST -P$MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD -D$MYSQL_DB --default-character-set=utf8 -e "source ${workDir}/db/dss_dml.sql"
202-
isSuccess "source dss_dml.sql"
203-
if [[ '2' = "$INSTALL_MODE" ]];then
190+
191+
if [[ '3' = "$INSTALL_MODE" ]];then
204192
echo "start to update azkaban and qualitis table info "
205193
#azkaban
206194
if [ $AZKABAN_ADRESS_IP == "127.0.0.1" ];then
@@ -229,7 +217,7 @@ if [[ '2' = "$MYSQL_INSTALL_MODE" ]];then
229217
fi
230218
fi
231219

232-
##env check
220+
## davinci db init
233221
echo "Do you want to clear davinci table information in the database ? If you have not installed davinci environment,you must input '2',if you have davinci installed,choice 1."
234222
echo " 1: Do not execute table-building statements"
235223
echo "WARN:"
@@ -252,7 +240,6 @@ else
252240
exit 1
253241
fi
254242

255-
256243
###linkis Eurkea info
257244
SERVER_IP=$EUREKA_INSTALL_IP
258245
SERVER_PORT=$EUREKA_PORT
@@ -362,6 +349,8 @@ ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.dss.appjoint.scheduler.project.sto
362349
isSuccess "subsitution linkis.properties of $SERVERNAME"
363350
echo "<----------------$SERVERNAME:end------------------->"
364351
echo ""
352+
353+
if [ '2' = "$INSTALL_MODE" ]||[ '3' = "$INSTALL_MODE" ];then
365354
##Flow execution Install
366355
PACKAGE_DIR=dss/dss-flow-execution-entrance
367356
SERVERNAME=dss-flow-execution-entrance
@@ -437,7 +426,7 @@ APPJOINTNAME_CONF_PATH_PATENT=$SERVER_HOME/$APPJOINTPARENT/$APPJOINTNAME/appjoin
437426
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#job.datachecker.jdo.option.url.*#job.datachecker.jdo.option.url=$HIVE_META_URL#g\" $APPJOINTNAME_CONF_PATH_PATENT"
438427
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#job.datachecker.jdo.option.username.*#job.datachecker.jdo.option.username=$HIVE_META_USER#g\" $APPJOINTNAME_CONF_PATH_PATENT"
439428
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#job.datachecker.jdo.option.password.*#job.datachecker.jdo.option.password=$HIVE_META_PASSWORD#g\" $APPJOINTNAME_CONF_PATH_PATENT"
440-
isSuccess "subsitution conf of $SERVERNAME"
429+
isSuccess "subsitution conf of datachecker"
441430
echo "<----------------datachecker appjoint install end------------------->"
442431
echo ""
443432
echo "<----------------eventchecker appjoint install start------------------->"
@@ -450,7 +439,7 @@ APPJOINTNAME_CONF_PATH_PATENT=$SERVER_HOME/$APPJOINTPARENT/$APPJOINTNAME/appjoin
450439
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#msg.eventchecker.jdo.option.url.*#msg.eventchecker.jdo.option.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}?characterEncoding=UTF-8#g\" $APPJOINTNAME_CONF_PATH_PATENT"
451440
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#msg.eventchecker.jdo.option.username.*#msg.eventchecker.jdo.option.username=$MYSQL_USER#g\" $APPJOINTNAME_CONF_PATH_PATENT"
452441
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#msg.eventchecker.jdo.option.password.*#msg.eventchecker.jdo.option.password=$MYSQL_PASSWORD#g\" $APPJOINTNAME_CONF_PATH_PATENT"
453-
isSuccess "subsitution conf of $SERVERNAME"
442+
isSuccess "subsitution conf of eventchecker"
454443
echo "<----------------$APPJOINTNAME:end------------------->"
455444
echo ""
456445
echo "<----------------visualis appjoint install start------------------->"
@@ -459,8 +448,10 @@ APPJOINTNAME=visualis
459448
#visualis appjoint install
460449
installAppjoints
461450
echo "<----------------$APPJOINTNAME:end------------------->"
462-
##sample version does not install qualitis APPJoint and scheduis APPJoint
463-
if [[ '2' = "$INSTALL_MODE" ]];then
451+
fi
452+
453+
##lite and sample version does not install qualitis APPJoint and scheduis APPJoint
454+
if [[ '3' = "$INSTALL_MODE" ]];then
464455
echo ""
465456
echo "<----------------qualitis appjoint install start------------------->"
466457
APPJOINTPARENT=dss-appjoints
@@ -469,7 +460,7 @@ APPJOINTNAME=qualitis
469460
installAppjoints
470461
APPJOINTNAME_CONF_PATH_PATENT=$SERVER_HOME/$APPJOINTPARENT/$APPJOINTNAME/appjoint.properties
471462
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#baseUrl=http://127.0.0.1:8090#baseUrl=http://$QUALITIS_ADRESS_IP:$QUALITIS_ADRESS_PORT#g\" $APPJOINTNAME_CONF_PATH_PATENT"
472-
isSuccess "subsitution conf of $SERVERNAME"
463+
isSuccess "subsitution conf of qualitis"
473464
echo "<----------------$APPJOINTNAME:end------------------->"
474465
echo ""
475466
echo "<----------------schedulis appjoint install start------------------->"
@@ -479,4 +470,4 @@ APPJOINTNAME=schedulis
479470
installAppjoints
480471
isSuccess "subsitution conf of schedulis"
481472
echo "<----------------$APPJOINTNAME:end------------------->"
482-
fi
473+
fi

0 commit comments

Comments
 (0)