Skip to content

Commit 4b08145

Browse files
Remove some of the logging now that we are explicitly setting topology flags and that passes CI
Signed-off-by: Rohit Nayak <[email protected]>
1 parent 6bb8826 commit 4b08145

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

examples/backups/restart_tablets.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919

2020
source ../common/backup-env.sh
2121

22-
echo "Topology flags at start of restart_tablets.sh: $TOPOLOGY_FLAGS"
23-
24-
echo "=============================== This is version 23 restart tablets ==============================="
2522
for i in 100 101 102; do
2623
CELL=zone1 TABLET_UID=$i ../common/backup-scripts/mysqlctl-up.sh
2724
CELL=zone1 KEYSPACE=commerce TABLET_UID=$i ../common/backup-scripts/vttablet-up.sh

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ if [[ "${uid: -1}" -gt 1 ]]; then
3333
tablet_type=rdonly
3434
fi
3535

36-
echo "Starting v23 backup vttablet for $alias..."
37-
echo "Topology flags inherited at start of v23 backup vttablet: $TOPOLOGY_FLAGS"
36+
# Additional logging and explicit topology flags for vttablet for the backup local example
37+
# to ensure it uses the underscored topology flags that are required for older vttablet versions.
38+
// TODO: in v25 we can start using the local example env.sh and common scripts and delete the extra
39+
// ones created for backup upgrade/downgrade tests to work.
40+
echo "Starting backup vttablet for $alias..."
41+
echo "Topology flags inherited at start of backup vttablet: $TOPOLOGY_FLAGS"
3842
export TOPOLOGY_FLAGS="--topo_implementation etcd2 --topo_global_server_address $ETCD_SERVER --topo_global_root /vitess/global"
39-
echo "Topology flags at start of v23 backup vttablet, after explicitly setting: $TOPOLOGY_FLAGS"
43+
echo "Topology flags at start of backup vttablet, after explicitly setting: $TOPOLOGY_FLAGS"
4044

4145

4246
# shellcheck disable=SC2086
@@ -69,14 +73,6 @@ for i in $(seq 0 300); do
6973
sleep 0.1
7074
done
7175

72-
73-
echo "======================= vttablet.out start ======================="
74-
cat $VTDATAROOT/$tablet_dir/vttablet.out
75-
echo "======================= vttablet.out end ======================="
76-
echo "======================= vttablet logs start ======================="
77-
cat $VTDATAROOT/tmp/*vttablet*
78-
echo "======================= vttablet logs end ======================="
79-
8076
# check one last time
8177
curl -I "http://$hostname:$port/debug/status" || fail "tablet could not be started!"
8278

examples/common/scripts/vttablet-up.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [[ "${uid: -1}" -gt 1 ]]; then
3333
tablet_type=rdonly
3434
fi
3535

36-
echo "Starting v23 common vttablet for $alias..."
36+
echo "Starting backup script for vttablet for $alias..."
3737

3838
# shellcheck disable=SC2086
3939
vttablet \

0 commit comments

Comments
 (0)