Skip to content

Commit

Permalink
Merge pull request #3 from WeBankFinTech/dev-1.0.0-alpha
Browse files Browse the repository at this point in the history
Pull the latest updates of dev-1.0.0-alpha
  • Loading branch information
wushengyeyouya authored Mar 21, 2021
2 parents 5be42ad + 636f564 commit 3dc7a71
Show file tree
Hide file tree
Showing 282 changed files with 8,237 additions and 1,883 deletions.
6 changes: 3 additions & 3 deletions README-ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ DSS主要特点:

## 快速安装使用

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

## 架构

Expand All @@ -167,7 +167,7 @@ DSS主要特点:

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

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

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

Expand Down Expand Up @@ -203,4 +203,4 @@ DSS主要特点:

## License

DSS is under the Apache 2.0 license. See the [License](LICENSE) file for details.
DSS is under the Apache 2.0 license. See the [License](LICENSE) file for details.
49 changes: 47 additions & 2 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -103,7 +103,52 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.6</version>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>net.databinder.dispatch</groupId>
<artifactId>dispatch-core_2.11</artifactId>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>net.databinder.dispatch</groupId>
<artifactId>dispatch-json4s-jackson_2.11</artifactId>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
<version>3.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.7</version>
</dependency>
<dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
<version>1.8.10</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions bin/checkEnv.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
#
# Copyright 2019 WeBank
#
Expand All @@ -13,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
#!/bin/sh
say() {
printf 'check command fail \n %s\n' "$1"
}
Expand All @@ -32,7 +32,7 @@ need_cmd() {
err "need '$1' (your linux command not found)"
fi
}
echo "<-----start to check linux cmd:yum java mysql unzip expect telnet sed tar---->"
echo "<-----start to check used cmd---->"
need_cmd yum
need_cmd java
need_cmd mysql
Expand All @@ -42,4 +42,4 @@ need_cmd telnet
need_cmd tar
need_cmd sed
need_cmd dos2unix
echo "<-----end to check linux cmd:yum java mysql unzip expect telnet sed tar------>"
echo "<-----end to check used cmd---->"
50 changes: 0 additions & 50 deletions bin/checkMicro.sh

This file was deleted.

91 changes: 91 additions & 0 deletions bin/checkServices.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
#
# Copyright 2019 WeBank
#
# Licensed 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.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#!/bin/sh
source ~/.bash_profile

shellDir=`dirname $0`
workDir=`cd ${shellDir}/..;pwd`

##load config
export LINKIS_DSS_CONF_FILE=${LINKIS_DSS_CONF_FILE:-"${workDir}/conf/config.sh"}
export DISTRIBUTION=${DISTRIBUTION:-"${workDir}/conf/config.sh"}
source ${LINKIS_DSS_CONF_FILE}
source ${DISTRIBUTION}

MICRO_SERVICE_NAME=$1
MICRO_SERVICE_IP=$2
MICRO_SERVICE_PORT=$3

local_host="`hostname --fqdn`"

ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')

function isLocal(){
if [ "$1" == "127.0.0.1" ];then
return 0
elif [ $1 == "localhost" ]; then
return 0
elif [ $1 == $local_host ]; then
return 0
elif [ $1 == $ipaddr ]; then
return 0
fi
return 1
}

function executeCMD(){
isLocal $1
flag=$?
echo "Is local "$flag
if [ $flag == "0" ];then
eval $2
else
ssh -p $SSH_PORT $1 $2
fi

}

#echo "<--------------------------------------------------------------------------->"
#echo "Start to Check if your microservice:$MICRO_SERVICE_NAME is normal via telnet"
#echo ""
#if ! executeCMD $SERVER_IP "test -e $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME"; then
# echo "$MICRO_SERVICE_NAME is not installed,the check steps will be skipped"
# exit 0
#fi
echo "==========================================================="
echo $MICRO_SERVICE_NAME
echo $MICRO_SERVICE_IP
echo $MICRO_SERVICE_PORT
echo "==========================================================="

if [ $MICRO_SERVICE_NAME == "visualis-server" ] && [ $MICRO_SERVICE_IP == "127.0.0.1" ]; then
MICRO_SERVICE_IP=$ipaddr
fi

result=`echo -e "\n" | telnet $MICRO_SERVICE_IP $MICRO_SERVICE_PORT 2>/dev/null | grep Connected | wc -l`
if [ $result -eq 1 ]; then
echo "$MICRO_SERVICE_NAME is ok."
else
echo "<--------------------------------------------------------------------------->"
echo "ERROR your $MICRO_SERVICE_NAME microservice is not start successful !!! ERROR logs as follows :"
echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
echo '<------------------------------------------------------------->'
executeCMD $MICRO_SERVICE_IP "tail -n 50 $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/*.out"
echo '<-------------------------------------------------------------->'
echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
exit 1
fi

Loading

0 comments on commit 3dc7a71

Please sign in to comment.