From 9ec1f3f9793bacda6f2873288255d55b2531008a Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Thu, 18 Aug 2022 19:54:02 +0800
Subject: [PATCH] [obd] alter for sync obd.sh

---
 deps/3rd/oceanbase.el7.x86_64.deps |  1 +
 tools/deploy/obd.sh                | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/deps/3rd/oceanbase.el7.x86_64.deps b/deps/3rd/oceanbase.el7.x86_64.deps
index b7936327de..fa1b2d2d5c 100644
--- a/deps/3rd/oceanbase.el7.x86_64.deps
+++ b/deps/3rd/oceanbase.el7.x86_64.deps
@@ -31,4 +31,5 @@ obdevtools-llvm-11.0.1-40.el7.x86_64.rpm
 devdeps-rocksdb-6.22.1-26.el7.x86_64.rpm
 
 [test-utils]
+ob-deploy-1.5.0-12.el7.x86_64.rpm target=community
 
diff --git a/tools/deploy/obd.sh b/tools/deploy/obd.sh
index 0b6f579b9d..cf33986e02 100755
--- a/tools/deploy/obd.sh
+++ b/tools/deploy/obd.sh
@@ -249,7 +249,6 @@ function get_obproxy {
 
     get_version_and_release
     get_baseurl
-    obd mirror disable remote
     if [[ "$baseurl" != "" && "$version" != "" && "$release" != "" ]]
     then
       pkg_name="obproxy-$version-$release.x86_64.rpm"
@@ -548,9 +547,27 @@ function main() {
     case "$1" in
       -v ) VERBOSE_FLAG='-v'; set -x; shift ;;
       --with-local-obproxy) WITH_LOCAL_PROXY="1";SKIP_COPY="1"; shift ;;
-      -c | --config ) YAML_CONF="$2"; shift 2 ;;
+      -c | --config ) 
+      if [[ "$commond" == "deploy" || "$commond" == "redeploy" ||  "$commond" == "mysqltest" ]]
+      then
+      YAML_CONF="$2"
+      shift 2 
+      else
+      extra_args="$extra_args $1"
+      shift
+      fi
+      ;;
       -n | --deploy-name ) DEPLOY_NAME="$2"; shift 2 ;;
-      -p | --data-path ) DATA_PATH="$2"; shift 2 ;;
+      -p | --data-path ) 
+      if [[ "$commond" == "prepare" ]]
+      then
+        DATA_PATH="$2";
+        shift 2 
+      else
+        extra_args="$extra_args $1"
+        shift
+      fi
+      ;;
       -N ) NO_CONFIRM="1"; shift ;;
       --ip ) IPADDRESS="$2"; shift 2 ;;
       # --disable-reboot ) DISABLE_REBOOT="1"; extra_args="$extra_args $1"; shift ;;
@@ -565,7 +582,6 @@ function main() {
   if [[ ! -f $DEPLOY_PATH/.obd/.obd_environ || "$(grep '"OBD_DEV_MODE": "1"' $DEPLOY_PATH/.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 mirror disable remote
   fi
   if [[  "$(grep '"OBD_DEPLOY_BASE_DIR":' $DEPLOY_PATH/.obd/.obd_environ)" == "" ]]
   then
@@ -583,7 +599,7 @@ function main() {
     deploy
     ;;
     redeploy)
-    deploy_cluster
+    deploy
     ;;
     start)
     start_cluster
-- 
GitLab