Harmonize local examples with helm improvements

Signed-off-by: Morgan Tocker <tocker@gmail.com>

examples/local/101_initial_cluster.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2019 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,30 +21,30 @@ source ./env.sh
 
 # start topo server
 if [ "${TOPO}" = "zk2" ]; then
- CELL=zone1 ./scripts/zk-up.sh
+	CELL=zone1 ./scripts/zk-up.sh
 elif [ "${TOPO}" = "k8s" ]; then
- CELL=zone1 ./scripts/k3s-up.sh
+	CELL=zone1 ./scripts/k3s-up.sh
 else
- CELL=zone1 ./scripts/etcd-up.sh
+	CELL=zone1 ./scripts/etcd-up.sh
 fi
 
 # start vtctld
 CELL=zone1 ./scripts/vtctld-up.sh
 
 # start vttablets for keyspace commerce
 for i in 100 101 102; do
- CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
- CELL=zone1 KEYSPACE=commerce TABLET_UID=$i ./scripts/vttablet-up.sh
+	CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
+	CELL=zone1 KEYSPACE=commerce TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
 # set one of the replicas to master
-vtctlclient -server localhost:15999 InitShardMaster -force commerce/0 zone1-100
+vtctlclient InitShardMaster -force commerce/0 zone1-100
 
 # create the schema
-vtctlclient -server localhost:15999 ApplySchema -sql-file create_commerce_schema.sql commerce
+vtctlclient ApplySchema -sql-file create_commerce_schema.sql commerce
 
 # create the vschema
-vtctlclient -server localhost:15999 ApplyVSchema -vschema_file vschema_commerce_initial.json commerce
+vtctlclient ApplyVSchema -vschema_file vschema_commerce_initial.json commerce
 
 # start vtgate
 CELL=zone1 ./scripts/vtgate-up.sh

examples/local/201_customer_tablets.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,11 +21,8 @@
 source ./env.sh
 
 for i in 200 201 202; do
- CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
- CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
+	CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
+	CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
-vtctlclient -server localhost:15999 InitShardMaster -force customer/0 zone1-200
-vtctlclient -server localhost:15999 ApplyVSchema -vschema '{ "tables": { "product": {} } }' commerce
-vtctlclient -server localhost:15999 ApplyVSchema -vschema '{ "tables": { "customer": {}, "corder": {} } }' customer
-
+vtctlclient InitShardMaster -force customer/0 zone1-200

examples/local/202_move_tables.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,12 +19,4 @@
 
 source ./env.sh
 
-vtctlclient \
-    -server localhost:15999 \
-    -log_dir "$VTDATAROOT"/tmp \
-    -alsologtostderr \
-    MoveTables \
-    -workflow=commerce2customer \
-    commerce customer customer,corder
-
-sleep 2
+vtctlclient MoveTables -workflow=commerce2customer commerce customer '{"customer":{}, "corder":{}}'

examples/local/203_switch_reads.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,20 +17,7 @@
 # this script migrates traffic for the new customer keyspace to the new
 # tablets of types rdonly and replica
 
+source ./env.sh
 
-vtctlclient \
- -server localhost:15999 \
- -log_dir "$VTDATAROOT"/tmp \
- -alsologtostderr \
- SwitchReads \
- -tablet_type=rdonly \
- customer.commerce2customer
-
-vtctlclient \
- -server localhost:15999 \
- -log_dir "$VTDATAROOT"/tmp \
- -alsologtostderr \
- SwitchReads \
- -tablet_type=replica \
- customer.commerce2customer
-
+vtctlclient SwitchReads -tablet_type=rdonly customer.commerce2customer
+vtctlclient SwitchReads -tablet_type=replica customer.commerce2customer

examples/local/204_switch_writes.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 # this script migrates master traffic for the customer keyspace to the
 # new master tablet
 
-vtctlclient \
- -server localhost:15999 \
- -log_dir "$VTDATAROOT"/tmp \
- -alsologtostderr \
- SwitchWrites \
- customer.commerce2customer
+source ./env.sh
+
+vtctlclient SwitchWrites customer.commerce2customer

examples/local/205_clean_commerce.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,9 @@
 # this script removes the customer and corder tables from the commerce
 # keyspace
 
-vtctlclient -server localhost:15999 ApplySchema -sql-file drop_commerce_tables.sql commerce
-vtctlclient -server localhost:15999 SetShardTabletControl -blacklisted_tables=customer,corder -remove commerce/0 rdonly
-vtctlclient -server localhost:15999 SetShardTabletControl -blacklisted_tables=customer,corder -remove commerce/0 replica
-vtctlclient -server localhost:15999 SetShardTabletControl -blacklisted_tables=customer,corder -remove commerce/0 master
+source ./env.sh
+
+vtctlclient SetShardTabletControl -blacklisted_tables=customer,corder -remove commerce/0 rdonly
+vtctlclient SetShardTabletControl -blacklisted_tables=customer,corder -remove commerce/0 replica
+vtctlclient SetShardTabletControl -blacklisted_tables=customer,corder -remove commerce/0 master
+vtctlclient ApplyRoutingRules -rules='{}'

examples/local/301_customer_sharded.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2019 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,9 @@
 # it also changes the customer vschema from unsharded to sharded and
 # sets up the necessary vindexes
 
-vtctlclient -server localhost:15999 ApplySchema -sql-file create_commerce_seq.sql commerce
-vtctlclient -server localhost:15999 ApplyVSchema -vschema_file vschema_commerce_seq.json commerce
-vtctlclient -server localhost:15999 ApplySchema -sql-file create_customer_sharded.sql customer
-vtctlclient -server localhost:15999 ApplyVSchema -vschema_file vschema_customer_sharded.json customer
+source ./env.sh
+
+vtctlclient ApplySchema -sql-file create_commerce_seq.sql commerce
+vtctlclient ApplyVSchema -vschema_file vschema_commerce_seq.json commerce
+vtctlclient ApplySchema -sql-file create_customer_sharded.sql customer
+vtctlclient ApplyVSchema -vschema_file vschema_customer_sharded.json customer

examples/local/302_new_shards.sh

@@ -1,33 +1,33 @@
 #!/bin/bash
 
 # Copyright 2019 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # this script brings up new tablets for the two new shards that we will
-# be creating in the customer keyspace and copies the schema 
+# be creating in the customer keyspace and copies the schema
 
 source ./env.sh
 
 for i in 300 301 302; do
- CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
- SHARD=-80 CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
+	CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
+	SHARD=-80 CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
 for i in 400 401 402; do
- CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
- SHARD=80- CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
+	CELL=zone1 TABLET_UID=$i ./scripts/mysqlctl-up.sh
+	SHARD=80- CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
-vtctlclient -server localhost:15999 InitShardMaster -force customer/-80 zone1-300
-vtctlclient -server localhost:15999 InitShardMaster -force customer/80- zone1-400
+vtctlclient InitShardMaster -force customer/-80 zone1-300
+vtctlclient InitShardMaster -force customer/80- zone1-400

examples/local/303_reshard.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,11 +19,4 @@
 
 source ./env.sh
 
-vtctlclient \
-    -server localhost:15999 \
-    -log_dir "$VTDATAROOT"/tmp \
-    -alsologtostderr \
-    Reshard \
-    customer.cust2cust "0" "-80,80-"
-
-sleep 2
+vtctlclient Reshard customer.cust2cust '0' '-80,80-'

examples/local/304_switch_reads.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,18 +16,7 @@
 
 # this script migrates traffic for the rdonly and replica tablets
 
-vtctlclient \
- -server localhost:15999 \
- -log_dir "$VTDATAROOT"/tmp \
- -alsologtostderr \
- SwitchReads \
- -tablet_type=rdonly \
- customer.cust2cust
+source ./env.sh
 
-vtctlclient \
- -server localhost:15999 \
- -log_dir "$VTDATAROOT"/tmp \
- -alsologtostderr \
- SwitchReads \
- -tablet_type=replica \
- customer.cust2cust
+vtctlclient SwitchReads -tablet_type=rdonly customer.cust2cust
+vtctlclient SwitchReads -tablet_type=replica customer.cust2cust

examples/local/305_switch_writes.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Copyright 2020 The Vitess Authors.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,12 +16,6 @@
 
 # this script migrates traffic for the master tablet
 
-vtctlclient \
- -server localhost:15999 \
- -log_dir "$VTDATAROOT"/tmp \
- -alsologtostderr \
- SwitchWrites \
- customer.cust2cust
-
-# data has been copied over to shards, and databases for the new shards are now available
+source ./env.sh
 
+vtctlclient SwitchWrites customer.cust2cust