fix: onebox

scchy · Mar 17, 2021 · 4b14862 · 4b14862
1 parent 67bc005
commit 4b14862
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 157 deletions.
diff --git a/onebox/start_onebox.sh b/onebox/start_onebox.sh
@@ -17,80 +17,40 @@ BLOB1=$IP:9720
 
 # start tablet0
 test -d tablet0-binlogs && rm -rf tablet0-binlogs
-test -d tablet0-hdd-binlogs && rm -rf tablet0-hdd-binlogs
-test -d tablet0-ssd-binlogs && rm -rf tablet0-ssd-binlogs
 test -d recycle_bin0 && rm -rf recycle_bin0
-test -d recycle_hdd_bin0 && rm -rf recycle_hdd_bin0
-test -d recycle_ssd_bin0 && rm -rf recycle_ssd_bin0
 ../build/bin/rtidb --db_root_path=tablet0-binlogs \
- --hdd_root_path=tablet0-hdd-binlogs \
- --ssd_root_path=tablet0-ssd-binlogs \
  --recycle_bin_root_path=recycle_bin0 \
- --recycle_ssd_bin_root_path=recycle_ssd_bin0 \
- --recycle_hdd_bin_root_path=recycle_hdd_bin0 \
  --endpoint=${TABLET1} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
  --zk_keep_alive_check_interval=100000000\
  --zk_root_path=/onebox > tablet0.log 2>&1 &
 test -d tablet1-binlogs && rm -rf tablet1-binlogs
-test -d tablet1-hdd-binlogs && rm -rf tablet1-hdd-binlogs
-test -d tablet1-ssd-binlogs && rm -rf tablet1-ssd-binlogs
 test -d recycle_bin1 && rm -rf recycle_bin1
-test -d recycle_hdd_bin1 && rm -rf recycle_hdd_bin1
-test -d recycle_ssd_bin1 && rm -rf recycle_ssd_bin1
 
 
 # start tablet1
 ../build/bin/rtidb --db_root_path=tablet1-binlogs \
- --hdd_root_path=tablet1-hdd-binlogs \
- --ssd_root_path=tablet1-ssd-binlogs \
  --recycle_bin_root_path=recycle_bin1 \
- --recycle_ssd_bin_root_path=recycle_ssd-bin1 \
- --recycle_hdd_bin_root_path=recycle_hdd-bin1 \
  --endpoint=${TABLET2} --role=tablet \
  --zk_cluster=${ZK_CLUSTER}\
  --binlog_notify_on_put=true\
  --zk_keep_alive_check_interval=100000000\
  --zk_root_path=/onebox > tablet1.log 2>&1 &
 test -d tablet2-binlogs && rm -rf tablet2-binlogs
-test -d tablet2-hdd-binlogs && rm -rf tablet2-hdd-binlogs
-test -d tablet2-ssd-binlogs && rm -rf tablet2-ssd-binlogs
 test -d recycle_bin2 && rm -rf recycle_bin2
-test -d recycle_hdd_bin2 && rm -rf recycle_hdd_bin2
-test -d recycle_ssd_bin2 && rm -rf recycle_ssd_bin2
 
 
 # start tablet2
 ../build/bin/rtidb --db_root_path=tablet2-binlogs \
- --hdd_root_path=tablet2-hdd-binlogs \
- --ssd_root_path=tablet2-ssd-binlogs \
  --recycle_bin_root_path=recycle_bin2 \
- --recycle_ssd_bin_root_path=recycle_ssd_bin2 \
- --recycle_hdd_bin_root_path=recycle_hdd_bin2 \
  --endpoint=${TABLET3} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
  --zk_keep_alive_check_interval=100000000\
  --zk_root_path=/onebox > tablet2.log 2>&1 &
 
-test -d blob1-hdd-binlogs && rm -rf blob1-hdd-binlogs
-test -d blob1-ssd-binlogs && rm -rf blob1-ssd-binlogs
 test -d recycle_bin3 && rm -rf recycle_bin3
-test -d recycle_ssd_bin3 && rm -rf recycle_ssd_bin3
-test -d recycle_hdd_bin3 && rm -rf recycle_hdd_bin3
-
-# start blob1
-../build/bin/rtidb --hdd_root_path=blob1-hdd-binlogs \
- --ssd_root_path=blob1-ssd-binlogs \
- --recycle_bin_root_path=recycle_bin3 \
- --recycle_ssd_bin_root_path=recycle_ssd_bin3 \
- --recycle_hdd_bin_root_path=recycle_hdd_bin3 \
- --endpoint=${BLOB1} --role=blob \
- --binlog_notify_on_put=true\
- --zk_cluster=${ZK_CLUSTER}\
- --zk_keep_alive_check_interval=100000000\
- --zk_root_path=/onebox > blob1.log 2>&1 &
 
 # start ns1 
 ../build/bin/rtidb --endpoint=${NS1} --role=nameserver \

diff --git a/onebox/start_onebox_on_rambuild.sh b/onebox/start_onebox_on_rambuild.sh
@@ -16,11 +16,7 @@ TABLET3=$IP:9522
 BLOB1=$IP:9720
 
 ../build/bin/rtidb --db_root_path=/rambuild/tablet0-binlogs \
- --hdd_root_path=/rambuild/tablet0-hdd-binlogs \
- --ssd_root_path=/rambuild/tablet0-ssd-binlogs \
  --recycle_bin_root_path=/rambuild/recycle_bin0 \
- --recycle_ssd_bin_root_path=/rambuild/recycle_ssd_bin0 \
- --recycle_hdd_bin_root_path=/rambuild/recycle_hdd_bin0 \
  --endpoint=${TABLET1} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
@@ -29,11 +25,7 @@ BLOB1=$IP:9720
 
 # start tablet1
 ../build/bin/rtidb --db_root_path=/rambuild/tablet1-binlogs \
- --hdd_root_path=/rambuild/tablet1-hdd-binlogs \
- --ssd_root_path=/rambuild/tablet1-ssd-binlogs \
  --recycle_bin_root_path=/rambuild/recycle_bin1 \
- --recycle_ssd_bin_root_path=/rambuild/recycle_ssd-bin1 \
- --recycle_hdd_bin_root_path=/rambuild/recycle_hdd-bin1 \
  --endpoint=${TABLET2} --role=tablet \
  --zk_cluster=${ZK_CLUSTER}\
  --binlog_notify_on_put=true\
@@ -42,11 +34,7 @@ BLOB1=$IP:9720
 
 # start tablet2
 ../build/bin/rtidb --db_root_path=/rambuild/tablet2-binlogs \
- --hdd_root_path=/rambuild/tablet2-hdd-binlogs \
- --ssd_root_path=/rambuild/tablet2-ssd-binlogs \
  --recycle_bin_root_path=/rambuild/recycle_bin2 \
- --recycle_ssd_bin_root_path=/rambuild/recycle_ssd_bin2 \
- --recycle_hdd_bin_root_path=/rambuild/recycle_hdd_bin2 \
  --endpoint=${TABLET3} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
@@ -79,19 +67,6 @@ sleep 2
  --zk_cluster=${ZK_CLUSTER}\
  --zk_root_path=/onebox > ns3.log 2>&1 &
 
-sleep 5
-# start blob1
-../build/bin/rtidb --hdd_root_path=/rambuild/blob1-hdd-binlogs \
- --ssd_root_path=/rambuild/blob1-ssd-binlogs \
- --recycle_bin_root_path=/rambuild/recycle_bin3 \
- --recycle_ssd_bin_root_path=/rambuild/recycle_ssd_bin3 \
- --recycle_hdd_bin_root_path=/rambuild/recycle_hdd_bin3 \
- --endpoint=${BLOB1} --role=blob \
- --binlog_notify_on_put=true\
- --zk_cluster=${ZK_CLUSTER}\
- --zk_keep_alive_check_interval=100000000\
- --zk_root_path=/onebox > blob1.log 2>&1 &
-
 sleep 5
 
 echo "start all ok"

diff --git a/onebox/start_onebox_on_rambuild_cj.sh b/onebox/start_onebox_on_rambuild_cj.sh
@@ -17,11 +17,7 @@ BLOB1=$IP:9720
 
 RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet0-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet0-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet0-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin0 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin0 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin0 \
  --endpoint=${TABLET1} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
@@ -30,11 +26,7 @@ RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 
 # start tablet1
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet1-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet1-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin1 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd-bin1 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd-bin1 \
  --endpoint=${TABLET2} --role=tablet \
  --zk_cluster=${ZK_CLUSTER}\
  --binlog_notify_on_put=true\
@@ -43,11 +35,7 @@ RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 
 # start tablet2
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet2-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet2-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet2-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin2 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin2 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin2 \
  --endpoint=${TABLET3} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
@@ -80,19 +68,6 @@ sleep 2
  --zk_cluster=${ZK_CLUSTER}\
  --zk_root_path=/onebox > ns3.log 2>&1 &
 
-sleep 5
-# start blob1
-../build/bin/rtidb --hdd_root_path=${RAMBUILD_PREFIX}/blob1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/blob1-ssd-binlogs \
- --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin3 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin3 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin3 \
- --endpoint=${BLOB1} --role=blob \
- --binlog_notify_on_put=true\
- --zk_cluster=${ZK_CLUSTER}\
- --zk_keep_alive_check_interval=100000000\
- --zk_root_path=/onebox > blob1.log 2>&1 &
-
 sleep 5
 
 echo "start all ok"

diff --git a/onebox/start_onebox_on_rambuild_cluster.sh b/onebox/start_onebox_on_rambuild_cluster.sh
@@ -17,11 +17,7 @@ BLOB1=$IP:9720
 
 RAMBUILD_PREFIX=/tmp/rambuild
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet0-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet0-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet0-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin0 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin0 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin0 \
  --endpoint=${TABLET1} --role=tablet \
  --binlog_notify_on_put=true\
  --enable_distsql=true\
@@ -31,11 +27,7 @@ RAMBUILD_PREFIX=/tmp/rambuild
 
 # start tablet1
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet1-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet1-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin1 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd-bin1 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd-bin1 \
  --endpoint=${TABLET2} --role=tablet \
  --zk_cluster=${ZK_CLUSTER}\
  --binlog_notify_on_put=true\
@@ -45,11 +37,7 @@ RAMBUILD_PREFIX=/tmp/rambuild
 
 # start tablet2
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet2-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet2-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet2-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin2 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin2 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin2 \
  --endpoint=${TABLET3} --role=tablet \
  --binlog_notify_on_put=true\
  --enable_distsql=true\
@@ -83,19 +71,6 @@ sleep 2
  --zk_cluster=${ZK_CLUSTER}\
  --zk_root_path=/cluster > ns3.log 2>&1 &
 
-sleep 5
-# start blob1
-../build/bin/rtidb --hdd_root_path=${RAMBUILD_PREFIX}/blob1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/blob1-ssd-binlogs \
- --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin3 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin3 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin3 \
- --endpoint=${BLOB1} --role=blob \
- --binlog_notify_on_put=true\
- --zk_cluster=${ZK_CLUSTER}\
- --zk_keep_alive_check_interval=100000000\
- --zk_root_path=/cluster > blob1.log 2>&1 &
-
 sleep 5
 
 echo "start all ok"

diff --git a/onebox/start_onebox_on_rambuild_cluster_cj.sh b/onebox/start_onebox_on_rambuild_cluster_cj.sh
@@ -17,11 +17,7 @@ BLOB1=$IP:9720
 
 RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet0-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet0-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet0-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin0 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin0 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin0 \
  --endpoint=${TABLET1} --role=tablet \
  --binlog_notify_on_put=true\
  --enable_distsql=true\
@@ -31,11 +27,7 @@ RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 
 # start tablet1
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet1-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet1-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin1 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd-bin1 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd-bin1 \
  --endpoint=${TABLET2} --role=tablet \
  --zk_cluster=${ZK_CLUSTER}\
  --binlog_notify_on_put=true\
@@ -45,11 +37,7 @@ RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 
 # start tablet2
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet2-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet2-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet2-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin2 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin2 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin2 \
  --endpoint=${TABLET3} --role=tablet \
  --binlog_notify_on_put=true\
  --enable_distsql=true\
@@ -83,19 +71,6 @@ sleep 2
  --zk_cluster=${ZK_CLUSTER}\
  --zk_root_path=/cluster > ns3.log 2>&1 &
 
-sleep 5
-# start blob1
-../build/bin/rtidb --hdd_root_path=${RAMBUILD_PREFIX}/blob1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/blob1-ssd-binlogs \
- --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin3 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin3 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin3 \
- --endpoint=${BLOB1} --role=blob \
- --binlog_notify_on_put=true\
- --zk_cluster=${ZK_CLUSTER}\
- --zk_keep_alive_check_interval=100000000\
- --zk_root_path=/cluster > blob1.log 2>&1 &
-
 sleep 5
 
 echo "start all ok"

diff --git a/onebox/start_onebox_on_rambuild_single_cj.sh b/onebox/start_onebox_on_rambuild_single_cj.sh
@@ -13,11 +13,7 @@ BLOB1=$IP:9720
 
 RAMBUILD_PREFIX=/Users/chenjing/tmp/rambuild
 ../build/bin/rtidb --db_root_path=${RAMBUILD_PREFIX}/tablet0-binlogs \
- --hdd_root_path=${RAMBUILD_PREFIX}/tablet0-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/tablet0-ssd-binlogs \
  --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin0 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin0 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin0 \
  --endpoint=${TABLET1} --role=tablet \
  --binlog_notify_on_put=true\
  --zk_cluster=${ZK_CLUSTER}\
@@ -32,18 +28,5 @@ sleep 2
  --request_timeout_ms=100000\
  --zk_root_path=/onebox > ns1.log 2>&1 &
 sleep 5
-# start blob1
-../build/bin/rtidb --hdd_root_path=${RAMBUILD_PREFIX}/blob1-hdd-binlogs \
- --ssd_root_path=${RAMBUILD_PREFIX}/blob1-ssd-binlogs \
- --recycle_bin_root_path=${RAMBUILD_PREFIX}/recycle_bin3 \
- --recycle_ssd_bin_root_path=${RAMBUILD_PREFIX}/recycle_ssd_bin3 \
- --recycle_hdd_bin_root_path=${RAMBUILD_PREFIX}/recycle_hdd_bin3 \
- --endpoint=${BLOB1} --role=blob \
- --binlog_notify_on_put=true\
- --zk_cluster=${ZK_CLUSTER}\
- --zk_keep_alive_check_interval=100000000\
- --zk_root_path=/onebox > blob1.log 2>&1 &
-
-sleep 5
 echo "start all ok"