More debugging logs and explicitly set TOPOLOGY FLAGS to see if it makes a difference

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

Author: rohit-nayak-ps

examples/backups/restart_tablets.sh

@@ -19,6 +19,8 @@
 
 source ../common/backup-env.sh
 
+echo "Topology flags at start of restart_tablets.sh: $TOPOLOGY_FLAGS"
+
 echo "=============================== This is version 23 restart tablets ==============================="
 for i in 100 101 102; do
   CELL=zone1 TABLET_UID=$i ../common/backup-scripts/mysqlctl-up.sh

examples/common/backup-scripts/consul-up.sh

@@ -43,7 +43,7 @@ sleep 5
 echo "add ${cell} CellInfo"
 set +e
 # shellcheck disable=SC2086
-command vtctldclient --server internal --topo-implementation consul --topo-global-server-address "${CONSUL_SERVER}:${consul_http_port}"  AddCellInfo \
+command vtctldclient --server internal --topo_implementation consul --topo_global_server_address "${CONSUL_SERVER}:${consul_http_port}"  AddCellInfo \
   --root "/vitess/${cell}" \
   --server-address "${CONSUL_SERVER}:${consul_http_port}" \
   "${cell}"

examples/common/backup-scripts/vttablet-up.sh

@@ -34,6 +34,10 @@ if [[ "${uid: -1}" -gt 1 ]]; then
 fi
 
 echo "Starting v23 backup vttablet for $alias..."
+echo "Topology flags inherited at start of v23 backup vttablet: $TOPOLOGY_FLAGS"
+export TOPOLOGY_FLAGS="--topo_implementation etcd2 --topo_global_server_address $ETCD_SERVER --topo_global_root /vitess/global"
+echo "Topology flags at start of v23 backup vttablet, after explicitly setting: $TOPOLOGY_FLAGS"
+
 
 # shellcheck disable=SC2086
 vttablet \

examples/common/backup-scripts/zk-up.sh

@@ -51,7 +51,7 @@ echo "Started zk servers."
 # Add the CellInfo description for the $CELL cell.
 # If the node already exists, it's fine, means we used existing data.
 set +e
-command vtctldclient --server internal --topo-implementation zk2 --topo-global-server-address "${ZK_SERVER}" AddCellInfo \
+command vtctldclient --server internal --topo_implementation zk2 --topo_global_server_address "${ZK_SERVER}" AddCellInfo \
   --root "/vitess/${cell}" \
   --server-address "${ZK_SERVER}" \
   "${cell}"