Skip to content

Commit 6b74665

Browse files
zwx-masterzwx-master
authored
Merge pull request #5 from WeBankFinTech/master
pull
2 parents 08de2e5 + 20f3832 commit 6b74665

File tree

54 files changed

+1588
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1588
-440
lines changed

‎README-ZH.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ DSS主要特点：
157157

158158
## 快速安装使用
159159

160-
点我进入[快速安装使用](docs/zh_CN/ch2/DSS快速安装使用文档.md)
160+
点我进入[快速安装使用](docs/zh_CN/ch2/DSS_LINKIS_Quick_Install.md)
161161

162162
## 架构
163163

@@ -167,7 +167,7 @@ DSS主要特点：
167167

168168
#### 1. 安装编译文档
169169

170-
[快速安装使用文档](docs/zh_CN/ch2/DSS快速安装使用文档.md)
170+
[快速安装使用文档](docs/zh_CN/ch2/DSS_LINKIS_Quick_Install.md)
171171

172172
[**DSS安装常见问题列表**](docs/zh_CN/ch1/DSS安装常见问题列表.md)
173173

@@ -203,4 +203,4 @@ DSS主要特点：
203203

204204
## License
205205

206-
DSS is under the Apache 2.0 license. See the [License](LICENSE) file for details.
206+
DSS is under the Apache 2.0 license. See the [License](LICENSE) file for details.

‎assembly/pom.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,51 @@
105105
<artifactId>jackson-core</artifactId>
106106
<version>2.9.6</version>
107107
</dependency>
108+
<dependency>
109+
<groupId>net.databinder.dispatch</groupId>
110+
<artifactId>dispatch-core_2.11</artifactId>
111+
<version>0.11.2</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>net.databinder.dispatch</groupId>
115+
<artifactId>dispatch-json4s-jackson_2.11</artifactId>
116+
<version>0.11.2</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.apache.htrace</groupId>
120+
<artifactId>htrace-core</artifactId>
121+
<version>3.1.0-incubating</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.apache.commons</groupId>
125+
<artifactId>commons-math3</artifactId>
126+
<version>3.1.1</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.apache.httpcomponents</groupId>
130+
<artifactId>httpclient</artifactId>
131+
<version>4.5.4</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>org.apache.httpcomponents</groupId>
135+
<artifactId>httpcore</artifactId>
136+
<version>4.4.7</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>com.ning</groupId>
140+
<artifactId>async-http-client</artifactId>
141+
<version>1.8.10</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>commons-beanutils</groupId>
145+
<artifactId>commons-beanutils</artifactId>
146+
<version>1.7.0</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>commons-beanutils</groupId>
150+
<artifactId>commons-beanutils-core</artifactId>
151+
<version>1.8.0</version>
152+
</dependency>
108153
</dependencies>
109154

110155
<artifactId>dss-assembly</artifactId>

‎bin/checkEnv.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/sh
12
#
23
# Copyright 2019 WeBank
34
#
@@ -13,7 +14,6 @@
1314
# See the License for the specific language governing permissions and
1415
# limitations under the License.
1516
#
16-
#!/bin/sh
1717
say() {
1818
printf 'check command fail \n %s\n' "$1"
1919
}
@@ -32,7 +32,7 @@ need_cmd() {
3232
err "need '$1' (your linux command not found)"
3333
fi
3434
}
35-
echo "<-----start to check linux cmd:yum java mysql unzip expect telnet sed tar---->"
35+
echo "<-----start to check used cmd---->"
3636
need_cmd yum
3737
need_cmd java
3838
need_cmd mysql
@@ -42,4 +42,4 @@ need_cmd telnet
4242
need_cmd tar
4343
need_cmd sed
4444
need_cmd dos2unix
45-
echo "<-----end to check linux cmd:yum java mysql unzip expect telnet sed tar------>"
45+
echo "<-----end to check used cmd---->"

‎bin/checkMicro.sh‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎bin/checkServices.sh‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
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+
export LINKIS_DSS_CONF_FILE=${LINKIS_DSS_CONF_FILE:-"${workDir}/conf/config.sh"}
24+
export DISTRIBUTION=${DISTRIBUTION:-"${workDir}/conf/config.sh"}
25+
source ${LINKIS_DSS_CONF_FILE}
26+
source ${DISTRIBUTION}
27+
28+
MICRO_SERVICE_NAME=$1
29+
MICRO_SERVICE_IP=$2
30+
MICRO_SERVICE_PORT=$3
31+
32+
local_host="`hostname --fqdn`"
33+
34+
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
35+
36+
function isLocal(){
37+
if [ "$1" == "127.0.0.1" ];then
38+
return 0
39+
elif [ $1 == "localhost" ]; then
40+
return 0
41+
elif [ $1 == $local_host ]; then
42+
return 0
43+
elif [ $1 == $ipaddr ]; then
44+
return 0
45+
fi
46+
return 1
47+
}
48+
49+
function executeCMD(){
50+
isLocal $1
51+
flag=$?
52+
echo "Is local "$flag
53+
if [ $flag == "0" ];then
54+
eval $2
55+
else
56+
ssh -p $SSH_PORT $1 $2
57+
fi
58+
59+
}
60+
61+
#echo "<--------------------------------------------------------------------------->"
62+
#echo "Start to Check if your microservice:$MICRO_SERVICE_NAME is normal via telnet"
63+
#echo ""
64+
#if ! executeCMD $SERVER_IP "test -e $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME"; then
65+
# echo "$MICRO_SERVICE_NAME is not installed,the check steps will be skipped"
66+
# exit 0
67+
#fi
68+
echo "==========================================================="
69+
echo $MICRO_SERVICE_NAME
70+
echo $MICRO_SERVICE_IP
71+
echo $MICRO_SERVICE_PORT
72+
echo "==========================================================="
73+
74+
if [ $MICRO_SERVICE_NAME == "visualis-server" ] && [ $MICRO_SERVICE_IP == "127.0.0.1" ]; then
75+
MICRO_SERVICE_IP=$ipaddr
76+
fi
77+
78+
result=`echo -e "\n" | telnet $MICRO_SERVICE_IP $MICRO_SERVICE_PORT 2>/dev/null | grep Connected | wc -l`
79+
if [ $result -eq 1 ]; then
80+
echo "$MICRO_SERVICE_NAME is ok."
81+
else
82+
echo "<--------------------------------------------------------------------------->"
83+
echo "ERROR your $MICRO_SERVICE_NAME microservice is not start successful !!! ERROR logs as follows :"
84+
echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
85+
echo '<------------------------------------------------------------->'
86+
executeCMD $MICRO_SERVICE_IP "tail -n 50 $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/*.out"
87+
echo '<-------------------------------------------------------------->'
88+
echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
89+
exit 1
90+
fi
91+

0 commit comments

Comments
 (0)