Skip to content

Q
qa-deploy-utils
Commit 4f50e1d1 authored by qa_quantgroup's avatar qa_quantgroup
Browse files
Options

修改type脚本为6个并发

parent cf530728
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 37 deletions
qa_shell_script/base_script/restartJava.sh
View file @ 4f50e1d1
......@@ -17,17 +17,17 @@ function ack()
echo "begin acknowledge whether the deploy start OK, ACK_PHRASE=${ack_phrase}, log_path=${log_path}"
while [ ! -f ${log_path} ]
do
echo "wait_log_generate_time is ${wait_log_generate_time}, max_wait_log_generate_time is ${max_wait_log_generate_time} "
echo "waiting for $project log, wait_log_generate_time is ${wait_log_generate_time}, max_wait_log_generate_time is ${max_wait_log_generate_time} "
if ((${wait_log_generate_time}>${max_wait_log_generate_time}))
then
echo "the log generated time exceed the limit"
echo "the $project log generated time exceed the limit"
exit -1
fi
echo 'the log does not exist, wait for 5 seconds'
echo "the $project log does not exist, wait for 5 seconds"
sleep 5
let "wait_log_generate_time+=5"
done
echo "listen for the log ack..."
echo "listen for the $project log ack..."
for ((i=0;;))
do
bootstrap_flag=`cat ${log_path} |grep "${ack_phrase}"| wc -l`
......@@ -35,13 +35,13 @@ function ack()
then
sleep 5
let "wait_ack_time+=5"
echo "waiting for bootstrap flag for ${wait_ack_time}"
echo "waiting for $project started flag for ${wait_ack_time}"
elif [ "${bootstrap_flag}" = 1 ]
then
echo "server is start~"
echo "server $project is start in $wait_ack_time seconds~"
exit 0
else
echo "server not startup in ${max_wait_ack_time} seconds..."
echo "server $project not startup in ${max_wait_ack_time} seconds..."
exit -1
fi
done
......@@ -58,8 +58,8 @@ sh $config_server/show_info.sh $project 重新启动 $desc `hostname`
cd $project_path/$project
P_UUID=`ps -ef|grep ${project}.jar |grep -v 'grep'|awk '{print $2}'`
if [ -n "${P_UUID}" ];then
echo "-----KILL $project PPID=${P_UUID}"
echo `kill -9 ${P_UUID}`
echo "--- Kill $project PPID=${P_UUID} ---"
kill -9 ${P_UUID}
sleep 2s
fi
......@@ -67,9 +67,9 @@ config_file=`find ./ -maxdepth 2 -name "application.properties"`
if [ -n "$config_file" ]
then
echo "have"
echo "$project already have config file"
else
echo "no have"
echo "$project have no config file"
if $is_public_ip && [ -n "$is_public_ip" ]
then
rm -rf /home/quant_group/${project}/application.properties
......@@ -82,7 +82,7 @@ else
fi
fi
echo "-----project:$project while be start"
echo "--- Project: $project will be start ---"
log_name=`node $config_server/get_project_config.js -name $project -attr log_name`
mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
......@@ -90,13 +90,18 @@ mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
echo "$run_command"
if [[ $project == "redpacket" ]]; then
echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
else
echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &
else
java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &
fi
if [[ $check_ack == "1" ]]; then
echo "dont check logs"
ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} 700
if [ $? -ne 0 ]
then
echo "Fail to start"
exit -1
fi
else
ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
if [ $? -ne 0 ]
......@@ -106,5 +111,3 @@ else
fi
fi
qa_shell_script/deploy_project_by_name.sh
View file @ 4f50e1d1
......@@ -5,29 +5,33 @@ public_ip=$3
sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh $project_name $branch_name $4
if [ $? = 0 ]; then
echo "2_get_code_by_name ok"
echo "--- $project_name 2_get_code_by_name ok ---"
else
echo "2_get_code_by_name fail"
echo "--- $project_name 2_get_code_by_name fail ---"
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh $project_name $public_ip $4
if [ $? = 0 ]; then
echo "3_link_config_file_by_name ok"
echo "--- $project_name 3_link_config_file_by_name ok ---"
else
echo "3_link_config_file_by_name fail"
echo "--- $project_name 3_link_config_file_by_name fail ---"
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/4_build_by_name.sh $project_name $public_ip $4
if [ $? = 0 ]; then
echo "4_build_by_name ok"
echo "--- $project_name 4_build_by_name ok ---"
else
echo "4_build_by_name fail"
echo "--- $project_name 4_build_by_name fail ---"
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh $project_name $public_ip $4
if [ $? = 0 ]; then
echo "5_restart_by_name ok"
echo "--- $project_name 5_restart_by_name ok ---"
else
echo "5_restart_by_name fail"
echo "--- $project_name 5_restart_by_name fail ---"
exit -1
fi
qa_shell_script/deploy_project_by_type.sh
View file @ 4f50e1d1
#!/bin/bash
date
project_type=$1
branch_name=$2
public_ip=$3
ip=$4
if [ $branch_name = "aaa" ];then
branch_name=""
fi
pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server"
project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh`
trap "exec 1000>&-;exec 1000<&-;exit 0" 2
tempfifo=$$.fifo
echo "mkfifo /tmp/$tempfifo"
mkfifo /tmp/$tempfifo
exec 1000<>/tmp/$tempfifo
rm -rf /tmp/$tempfifo
echo "********"
if [ "$project_type" = "all" ]
then
......@@ -21,16 +31,64 @@ then
projects=(`node $config_server/get_project_config.js -type python -attr name`)
echo ${#projects[@]}"个python项目:" ${projects[@]}
else
for ((i=1; i<=6; i++))
do
echo >&1000
done
projects=(`node $config_server/get_project_config.js -type $1 -attr name`)
echo ${#projects[@]}"个"$1"项目:" ${projects[@]}
for project_name in ${projects[@]}
do
read -u1000
{
sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh $project_name "$branch_name" $4
if [ $? = 0 ]; then
echo "--- $project_name 2_get_code_by_name ok ---"
else
echo "--- $project_name 2_get_code_by_name fail ---"
echo >&1000
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh $project_name $public_ip $4
if [ $? = 0 ]; then
echo "--- $project_name 3_link_config_file_by_name ok ---"
else
echo "--- $project_name 3_link_config_file_by_name fail ---"
echo >&1000
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/4_build_by_name.sh $project_name $public_ip $4
if [ $? = 0 ]; then
echo "--- $project_name 4_build_by_name ok ---"
else
echo "--- $project_name 4_build_by_name fail ---"
echo >&1000
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh $project_name $public_ip $4
if [ $? = 0 ]; then
echo "--- $project_name 5_restart_by_name ok ---"
else
echo "--- $project_name 5_restart_by_name fail ---"
echo >&1000
exit -1
fi
echo >&1000
}&
done
wait
fi
echo "********"
echo "********sh 2_get_code_by_type.sh $project_type $branch_name $ip********"
sh 2_get_code_by_type.sh $project_type $branch_name $ip
echo "********sh 3_link_config_file_by_type.sh $project_type $public_ip $ip********"
sh 3_link_config_file_by_type.sh $project_type $public_ip $ip
echo "********sh 4_build_by_type.sh $project_type $public_ip $ip********-"
sh 4_build_by_type.sh $project_type $public_ip $ip
echo "********sh 5_restart_by_type.sh $project_type $public_ip $ip********"
sh 5_restart_by_type.sh $project_type $public_ip $ip
date
#echo "********"
#echo "********sh 2_get_code_by_type.sh $project_type $branch_name $ip********"
#sh 2_get_code_by_type.sh $project_type $branch_name $ip
#echo "********sh 3_link_config_file_by_type.sh $project_type $public_ip $ip********"
#sh 3_link_config_file_by_type.sh $project_type $public_ip $ip
#echo "********sh 4_build_by_type.sh $project_type $public_ip $ip********-"
#sh 4_build_by_type.sh $project_type $public_ip $ip
#echo "********sh 5_restart_by_type.sh $project_type $public_ip $ip********"
#sh 5_restart_by_type.sh $project_type $public_ip $ip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment