hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

obd update: support more deploy syntax and use new deploy.py by default

Browse Source
This commit is contained in:
tuitang00 2023-05-12 03:41:28 +00:00 committed by ob-robot
parent 70bb6c4808
commit 3674a6668d
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deploy/activate_obd.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash
DIR=$(readlink -f "$(dirname ${BASH_SOURCE[0]})/../..")
OB_DO_GLOBAL_CONFIG=~/.ob_do_global
[[ -f $OB_DO_GLOBAL_CONFIG ]] && source $OB_DO_GLOBAL_CONFIG
export DEPLOY_PATH=$DIR/tools/deploy
if grep 'dep_create.sh' $DIR/build.sh 2>&1 >/dev/null
then
@ -61,7 +63,7 @@ function _obd_sh_complete_func
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
all_cmds["$*"]="prepare deploy redeploy reinstall start stop restart destroy upgrade mysqltest pid ssh less gdb sql mysql oracle edit list sys display create_tenant drop_tenant sysbench tpch tpcc tpcds graph display-trace"
all_cmds["$*"]="prepare deploy redeploy reinstall start stop restart destroy upgrade mysqltest pid ssh less gdb sql mysql oracle edit list sys display create_tenant drop_tenant sysbench tpch tpcc tpcds graph display-trace set-config"
case $prev in
list)
return 0

28
tools/deploy/obd.sh
View File

@ -233,9 +233,10 @@ function get_deploy_name {
cluster_num=$(echo "$cluster_dirs" | wc -l )
if (( ${cluster_num} == 1 )) && [[ -f $DEFAULT_DEPLOY_NAME_FILE ]]
then
deploy_name=$(cat "$DEFAULT_DEPLOY_NAME_FILE") &&
show_deploy_name &&
return
deploy_name=$(cat "$DEFAULT_DEPLOY_NAME_FILE") && show_deploy_name && return
elif [[ "$OB_DO_DEFAULT_DEPLOY_NAME" ]]
then
deploy_name=$OB_DO_DEFAULT_DEPLOY_NAME && show_deploy_name && return
fi
echo """
Deploy name is required. Use -n <deploy-name> to set the deploy name.
@ -537,6 +538,20 @@ function graph {
obd tool graph $deploy_name $extra_args
}
function set-config {
OB_DO_GLOBAL_CONFIG=${OB_DO_GLOBAL_CONFIG:-~/.ob_do_global}
touch $OB_DO_GLOBAL_CONFIG
if [[ "$1" != "" ]]; then
key="$1"
value="$2"
if [[ $(grep -E "^$key=" $OB_DO_GLOBAL_CONFIG) ]]; then
sed -i "s/^$key=.*/$key=$value/g" $OB_DO_GLOBAL_CONFIG
else
echo "$key=$value" >> $OB_DO_GLOBAL_CONFIG
fi
fi
}
function help_info {
echo """
@ -654,7 +669,7 @@ function main() {
if [[ ! -f $OBD_HOME/.obd/.obd_environ || "$(grep '"OBD_DEV_MODE": "1"' $OBD_HOME/.obd/.obd_environ)" == "" ]]
then
obd devmode enable || (echo "Exec obd cmd failed. If your branch is based on 3.1_opensource_release, please go to the deps/3rd directory and execute 'bash dep_create.sh all' to install obd." && exit 1)
obd env set OBD_LOCK_MODE 1
[[ "$OBD_LOCK_MODE" ]] || obd env set OBD_LOCK_MODE 1
fi
if [[ "$(grep '"OBD_DEPLOY_BASE_DIR":' $DEPLOY_PATH/.obd/.obd_environ)" == "" ]]
then
@ -707,7 +722,7 @@ function main() {
connect
;;
oracle)
extra_args="--user SYS --tenant oracle $extra_args"
extra_args="--user SYS -m OB_ORACLE --tenant oracle $extra_args"
connect
;;
pid)
@ -760,6 +775,9 @@ function main() {
display-trace)
obd display-trace ${extra_args}
;;
set-config)
set-config ${extra_args}
;;
*)
echo "Unknown command: $command"
help_info