Skip to content

Solve problems during installation #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Davidhua1996 merged 6 commits into from
Jun 29, 2022
Merged

Solve problems during installation #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d262b19
Remove StreamSQL development menu in DSS
Jun 27, 2022
d5d7407
Optimize install.sh
Jun 27, 2022
69592fb
Merge branch 'dev-0.2.0-webank' into dev-0.2.0
Jun 27, 2022
f9f0b65
Solve the problem of no loss of Streamis Product Center
Jun 28, 2022
d414ffb
Merge branch 'dev-0.2.0-webank' into dev-0.2.0
Jun 28, 2022
d3f3e48
Merge pull request #32 from WeDataSphere/dev-0.2.0
Davidhua1996 Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 22 additions & 31 deletions bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ txt=""
if [[ "$OSTYPE" == "darwin"* ]]; then
txt="''"
elif [[ "$OSTYPE" == "linux-gnu" ]]; then
# linux
txt=""
elif [[ "$OSTYPE" == "cygwin" ]]; then
echo "streamis not support Windows operating system"
Expand Down Expand Up @@ -100,48 +99,40 @@ if [[ '2' = "$MYSQL_INSTALL_MODE" ]];then
fi



###linkis Eurkea info
SERVER_IP=$EUREKA_INSTALL_IP
SERVER_PORT=$EUREKA_PORT
SERVER_HOME=$STREAMIS_INSTALL_HOME

if test -z "$SERVER_IP"
then
SERVER_IP=$local_host
fi
EUREKA_URL=http://$SERVER_IP:$EUREKA_PORT/eureka/
EUREKA_URL=http://$EUREKA_INSTALL_IP:$EUREKA_PORT/eureka/

##function start
function installPackage(){
echo "start to install $SERVERNAME"
echo "$SERVERNAME-step1: create dir"
if test -z "$SERVER_IP"
then
SERVER_IP=$local_host
fi

if ! ssh -p $SSH_PORT $SERVER_IP test -e $SERVER_HOME; then
ssh -p $SSH_PORT $SERVER_IP "sudo mkdir -p $SERVER_HOME;sudo chown -R $deployUser:$deployUser $SERVER_HOME"
if ! test -e $SERVER_HOME; then
sudo mkdir -p $SERVER_HOME;sudo chown -R $deployUser:$deployUser $SERVER_HOME
isSuccess "create the dir of $SERVERNAME"
fi

echo "$SERVERNAME-step2:copy install package"
scp -P $SSH_PORT ${workDir}/share/$PACKAGE_DIR/$SERVERNAME.zip $SERVER_IP:$SERVER_HOME
cp ${workDir}/share/$PACKAGE_DIR/$SERVERNAME.zip $SERVER_HOME
isSuccess "copy ${SERVERNAME}.zip"
ssh -p $SSH_PORT $SERVER_IP "cd $SERVER_HOME/;rm -rf $SERVERNAME-bak; mv -f $SERVERNAME $SERVERNAME-bak"
ssh -p $SSH_PORT $SERVER_IP "cd $SERVER_HOME/;unzip $SERVERNAME.zip > /dev/null"
cd $SERVER_HOME/;rm -rf $SERVERNAME-bak; mv -f $SERVERNAME $SERVERNAME-bak
cd $SERVER_HOME/;unzip $SERVERNAME.zip > /dev/null
isSuccess "unzip ${SERVERNAME}.zip"

echo "$SERVERNAME-step3:subsitution conf"
SERVER_CONF_PATH=$SERVER_HOME/$SERVERNAME/conf/application.yml
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#port:.*#port: $SERVER_PORT#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#defaultZone:.*#defaultZone: $EUREKA_URL#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#hostname:.*#hostname: $SERVER_IP#g\" $SERVER_CONF_PATH"
sed -i "s#port:.*#port: $SERVER_PORT#g" $SERVER_CONF_PATH
sed -i "s#defaultZone:.*#defaultZone: $EUREKA_URL#g" $SERVER_CONF_PATH
sed -i "s#hostname:.*#hostname: $SERVER_IP#g" $SERVER_CONF_PATH
isSuccess "subsitution conf of $SERVERNAME"
}
##function end

function setDatasourcePassword(){
PASSWORD=$MYSQL_PASSWORD
temp=${PASSWORD//#/%tream%}
sed -i "s#wds.linkis.server.mybatis.datasource.password.*#wds.linkis.server.mybatis.datasource.password=$temp#g" $SERVER_CONF_PATH
sed -i "s/%tream%/#/g" $SERVER_CONF_PATH
}
##function end


##Streamis-Server Install
Expand All @@ -155,12 +146,12 @@ installPackage
###update Streamis-Server linkis.properties
echo "$SERVERNAME-step4:update linkis.properties"
SERVER_CONF_PATH=$SERVER_HOME/$SERVERNAME/conf/linkis.properties
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.linkis.server.mybatis.datasource.url.*#wds.linkis.server.mybatis.datasource.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}?characterEncoding=UTF-8#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.linkis.server.mybatis.datasource.username.*#wds.linkis.server.mybatis.datasource.username=$MYSQL_USER#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.linkis.server.mybatis.datasource.password.*#wds.linkis.server.mybatis.datasource.password=$MYSQL_PASSWORD#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g\" $SERVER_CONF_PATH"
ssh -p $SSH_PORT $SERVER_IP "sed -i \"s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}#g\" $SERVER_CONF_PATH"
sed -i "s#wds.linkis.server.mybatis.datasource.url.*#wds.linkis.server.mybatis.datasource.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}?characterEncoding=UTF-8#g" $SERVER_CONF_PATH
sed -i "s#wds.linkis.server.mybatis.datasource.username.*#wds.linkis.server.mybatis.datasource.username=$MYSQL_USER#g" $SERVER_CONF_PATH
setDatasourcePassword
sed -i "s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g" $SERVER_CONF_PATH
sed -i "s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g" $SERVER_CONF_PATH
sed -i "s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}#g" $SERVER_CONF_PATH
isSuccess "subsitution linkis.properties of $SERVERNAME"
echo "<----------------$SERVERNAME:end------------------->"
echo ""
Expand Down
6 changes: 6 additions & 0 deletions streamis-appconn/src/main/resources/init.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
delete from `dss_workspace_dictionary` WHERE `appconn_name` = 'streamis';

INSERT INTO `dss_workspace_dictionary` ( `workspace_id`, `parent_key`, `dic_name`, `dic_name_en`, `dic_key`, `dic_value`, `dic_value_en`, `title`, `title_en`, `url`, `url_type`,`icon`, `order_num`, `remark`, `create_user`, `create_time`, `update_user`, `update_time`, appconn_name)
VALUES ('0','p_develop_process','流式生产中心','Streamis Product Center','pdp_streamis_product_center','streamis_prod',NULL,NULL,NULL,
'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/realtimeJobCenter?projectName=${projectName}&workspaceName=${workspaceName}','0','kaifa-icon','1','工程开发流程-流式生产中心','SYSTEM','2020-12-28 17:32:35',NULL,'2022-06-30 17:49:02','streamis');

select @old_dss_appconn_id:=id from `dss_appconn` where `appconn_name` = 'streamis';

delete from `dss_workspace_menu_appconn` WHERE `appconn_id` = @old_dss_appconn_id;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/webank/wedatasphere/streamis/jobmanager/restful/api/JobRestfulApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public Message createOrUpdate(HttpServletRequest req, @Validated @RequestBody Me
if (StringUtils.isBlank(projectName)){
return Message.error("Project name cannot be empty(项目名不能为空，请指定)");
}
if(!this.privilegeService.hasAccessPrivilege(req, projectName)){
if(!this.privilegeService.hasEditPrivilege(req, projectName)){
return Message.error("Have no permission to create or update StreamJob in project [" + projectName + "]");
}
StreamJobVersion job = streamJobService.createOrUpdate(username, metaJsonInfo);
Expand Down