Sync for commit 893cc9d7b6f80eab3b103ec327330ad501e16e4f

Signed-off-by: Rohit Nayak <[email protected]>

Author: rohit-nayak-ps

examples/env.sh

@@ -7,6 +7,7 @@ function fail() {
   exit 1
 }
 
+
 if [[ $EUID -eq 0 ]]; then
   fail "This script refuses to be run as root. Please switch to a regular user."
 fi
@@ -18,17 +19,17 @@ for binary in mysqld etcd etcdctl curl vtctlclient vttablet vtgate vtctld mysqlc
 done;
 
 ETCD_SERVER="localhost:2379"
-TOPOLOGY_FLAGS="-topo_implementation etcd2 -topo_global_server_address $ETCD_SERVER -topo_global_root /vitess/global"
+TOPOLOGY_FLAGS="--topo_implementation etcd2 --topo_global_server_address $ETCD_SERVER --topo_global_root /vitess/global"
 
 mkdir -p "${VTDATAROOT}/etcd"
 
 mkdir -p "${VTDATAROOT}/tmp"
 
 alias mysql="command mysql -h 127.0.0.1 -P 15306"
-alias vtctlclient="command vtctlclient -server localhost:15999 -log_dir ${VTDATAROOT}/tmp"
+alias vtctlclient="command vtctlclient --server localhost:15999 --log_dir ${VTDATAROOT}/tmp"
 
 # Make sure aliases are expanded in non-interactive shell
 shopt -s expand_aliases
 
 export MYSQL="command mysql -h 127.0.0.1 -P 15306"
-export LVTCTL="command vtctlclient -server localhost:15999 -log_dir ${VTDATAROOT}/tmp"
+export LVTCTL="command vtctlclient --server localhost:15999 --log_dir ${VTDATAROOT}/tmp"

examples/load.sh

@@ -1,30 +1,33 @@
-
-setup(){
+setup() {
   echo ">>>>> Cleaning up previous runs, if any"
   ./cleanup.sh
 
-
   echo ">>>>>> Starting etcd"
   scripts/etcd-up.sh
+
   echo ">>>>>> Starting vtctld"
   scripts/vtctld-up.sh
+
+}
+
+startVTGate() {
   echo ">>>>>> Starting vtgate"
   scripts/vtgate-up.sh
   sleep 2
   mysql -h 127.0.0.1 -P 19327 -u msandbox --password=msandbox commerce -e "truncate table _vt.resharding_journal"
   mysql -h 127.0.0.1 -P 19327 -u msandbox --password=msandbox commerce -e "truncate table _vt.vreplication"
-}
 
-unmanaged(){
+}
+unmanaged() {
   echo ">>>>>> Step 1: Starting unmanaged tablet (load1 keyspace)"
   scripts/unmanaged_load.sh
   sleep 5
 }
 
-movetables(){
+movetables() {
   echo ">>>>>> Step 2: Starting load2 tablets"
   for shard in "0"; do
-    for i in 200 201 202;  do
+    for i in 200 201 202; do
       CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
       CELL=zone1 KEYSPACE=load2 TABLET_UID=$i SHARD=$shard ./scripts/vttablet-up.sh
     done
@@ -33,7 +36,7 @@ movetables(){
   sleep 10
 
   $LVTCTL InitShardMaster -force load2/0 zone1-200
-exit
+  exit
   sleep 2
   echo ">>>>>> Step 3. Calling MoveTables"
   TABLE=Email
@@ -42,10 +45,9 @@ exit
   TARGET_KS=load2
   KSWF=$TARGET_KS.$WORKFLOW
   $LVTCTL MoveTables -tablet_types=MASTER -workflow=$WORKFLOW $SOURCE_KS $TARGET_KS $TABLE
-  if [ $? -eq 1 ]
-  then
-     echo "Error in MoveTables, exiting"
-     exit
+  if [ $? -eq 1 ]; then
+    echo "Error in MoveTables, exiting"
+    exit
   fi
 
   # TABLE2=c3
@@ -64,10 +66,9 @@ exit
 
   echo ">>>>>> Step 6. Calling SwitchReads"
   $LVTCTL SwitchReads -tablet_type=rdonly $KSWF
-  if [ $? -eq 1 ]
-  then
-     echo "Error in SwitchReads, exiting"
-     exit
+  if [ $? -eq 1 ]; then
+    echo "Error in SwitchReads, exiting"
+    exit
   fi
   $LVTCTL SwitchReads -tablet_type=replica $KSWF
   sleep 5
@@ -87,16 +88,16 @@ reshard() {
 
   echo ">>>>>>>> applying schema/vschema"
   $LVTCTL ApplySchema -sql-file sql/c2_seq.sql $TARGET_KS
-  $LVTCTL ApplyVSchema -vschema_file sql/load2_sharded_vschema.json $TARGET_KS
-  $LVTCTL RebuildVSchemaGraph -cells=zone1
+  $LVTCTL ApplyVSchema --vschema_file sql/load2_sharded_vschema.json $TARGET_KS
+  $LVTCTL RebuildVSchemaGraph --cells=zone1
 
   echo ">>>>>> Step 8: Starting $TARGET_KS tablets"
   shards=('-80' '80-')
-  for ((idx=0; idx<${#shards[@]}; ++idx)); do
+  for ((idx = 0; idx < ${#shards[@]}; ++idx)); do
     shard=${shards[idx]}
     echo "idx $idx, shard is $shard"
-    for i in 1 2 3;  do
-      TID=`expr 299 + $idx \* 100 + $i`
+    for i in 1 2 3; do
+      TID=$(expr 299 + $idx \* 100 + $i)
       echo "Creating tablet $TID"
       CELL=zone1 TABLET_UID=$TID ./scripts/mysqlctl-up.sh
       CELL=zone1 KEYSPACE=$TARGET_KS TABLET_UID=$TID SHARD="$shard" ./scripts/vttablet-up.sh
@@ -111,10 +112,9 @@ reshard() {
   echo ">>>>>> Step 9. Calling Reshard"
 
   $LVTCTL Reshard -tablet_types=MASTER $KSWF "0" "-80,80-"
-  if [ $? -eq 1 ]
-  then
-     echo "Error in Reshard, exiting"
-     exit
+  if [ $? -eq 1 ]; then
+    echo "Error in Reshard, exiting"
+    exit
   fi
   echo ">>>>> Step 4. Waiting for Vreplication to copy the data ..."
   sleep 5
@@ -129,35 +129,38 @@ reshard() {
   $LVTCTL SwitchWrites $KSWF
 }
 
-
 source ./env.sh
 
 main() {
   source ./step.sh
   STEP="${STEP:=0}"
-  NEXTSTEP="$(($STEP+1))"
-  echo "export STEP='$NEXTSTEP'" > step.sh
+  NEXTSTEP="$(($STEP + 1))"
+  echo "export STEP='$NEXTSTEP'" >step.sh
 
   case "$NEXTSTEP" in
 
-    "1") setup
-       unmanaged
-       movetables
-       ;;
-    "2") reshard
-       ;;
-    *) echo "Unknown parameter"
-       ;;
+  "1")
+    setup
+    unmanaged
+    movetables
+    ;;
+  "2")
+    reshard
+    ;;
+  *)
+    echo "Unknown parameter"
+    ;;
   esac
 }
 
 mt() {
-setup
-unmanaged
-movetables
+  setup
+  unmanaged
+  movetables
 }
 rs() {
   reshard
 }
-mt
+setup
+unmanaged
 #rs

examples/scripts/etcd-up.sh

@@ -5,6 +5,7 @@ export ETCDCTL_API=2
 
 # Check that etcd is not already running
 curl "http://${ETCD_SERVER}" > /dev/null 2>&1 && fail "etcd is already running. Exiting."
+set -x
 
 etcd --enable-v2=true --data-dir "${VTDATAROOT}/etcd/"  --listen-client-urls "http://${ETCD_SERVER}" --advertise-client-urls "http://${ETCD_SERVER}" > "${VTDATAROOT}"/tmp/etcd.out 2>&1 &
 PID=$!
@@ -22,10 +23,11 @@ etcdctl --endpoints "http://${ETCD_SERVER}" mkdir /vitess/$cell &
 echo "add $cell CellInfo"
 set +e
 # shellcheck disable=SC2086
-vtctl $TOPOLOGY_FLAGS AddCellInfo \
-  -root /vitess/$cell \
-  -server_address "${ETCD_SERVER}" \
+vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo \
+  --root /vitess/$cell \
+  --server-address "${ETCD_SERVER}" \
   $cell
+
 set -e
 
 echo "etcd start done..."

examples/scripts/mysqlctl-up.sh

@@ -19,7 +19,7 @@ if [ -d $VTDATAROOT/$tablet_dir ]; then
 fi
 
 mysqlctl \
- -log_dir $VTDATAROOT/tmp \
- -tablet_uid $uid \
- -mysql_port $mysql_port \
+ --log_dir $VTDATAROOT/tmp \
+ --tablet_uid $uid \
+ --mysql_port $mysql_port \
  $action

examples/scripts/populate2.go

@@ -1,57 +1,58 @@
 package main
+
 import (
-    "fmt"
-    "time"
-    "database/sql"
-    _ "github.com/go-sql-driver/mysql"
-    "github.com/paulbellamy/ratecounter"
+	"database/sql"
+	"fmt"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/paulbellamy/ratecounter"
+	"time"
 )
 
-func PrepareTx(db *sql.DB,qry string) (tx *sql.Tx, s *sql.Stmt, e error) {
- if tx,e=db.Begin(); e!=nil {
-  return
- }
+func PrepareTx(db *sql.DB, qry string) (tx *sql.Tx, s *sql.Stmt, e error) {
+	if tx, e = db.Begin(); e != nil {
+		return
+	}
 
- if s, e = tx.Prepare(qry);e!=nil {
-	 panic(e.Error())
- }
- return
+	if s, e = tx.Prepare(qry); e != nil {
+		panic(e.Error())
+	}
+	return
 }
 
 func main() {
-    counter := ratecounter.NewRateCounter(1 * time.Second)
-    done := false
-    var i int64
-    query := "insert into c1(c1) values (?)"
-    i = 0
-    db, err := sql.Open("mysql", "msandbox:msandbox@tcp(127.0.0.1:19327)/test")
-    fmt.Println("connection opened")
-    if err != nil {
-	panic(err.Error())
-     }
-    defer db.Close()
-    now := time.Now().UnixNano()
-    tx, stmt, err := PrepareTx(db, query)
-    if err != nil {
-	panic(err.Error())
-    }
-    for !done {
-	    //time.Sleep(1 * time.Millisecond)
+	counter := ratecounter.NewRateCounter(1 * time.Second)
+	done := false
+	var i int64
+	query := "insert into c1(c1) values (?)"
+	i = 0
+	db, err := sql.Open("mysql", "msandbox:msandbox@tcp(127.0.0.1:19327)/test")
+	fmt.Println("connection opened")
+	if err != nil {
+		panic(err.Error())
+	}
+	defer db.Close()
+	now := time.Now().UnixNano()
+	tx, stmt, err := PrepareTx(db, query)
+	if err != nil {
+		panic(err.Error())
+	}
+	for !done {
+		//time.Sleep(1 * time.Millisecond)
 		i++
 		counter.Incr(1)
-		if _,err := stmt.Exec(now+i); err != nil {
-				panic(err)
+		if _, err := stmt.Exec(now + i); err != nil {
+			panic(err)
 		}
-		if i % 10000  == 0 {
+		if i%10000 == 0 {
 			fmt.Printf("QPS: %d\n", counter.Rate())
-			if err := tx.Commit(); err!=nil {
+			if err := tx.Commit(); err != nil {
 				panic(err)
 			}
 			tx, stmt, err = PrepareTx(db, query)
 			if err != nil {
 				panic(err.Error())
 			}
 		}
-    }
+	}
 
 }