Replace all underscore flags in examples

rohit-nayak-ps · rohit-nayak-ps · commit 898720d5436c · 2025-09-09T08:49:48.000+02:00
Signed-off-by: Rohit Nayak &lt;rohit@planetscale.com&gt;
diff --git a/examples/backups/stop_tablets.sh b/examples/backups/stop_tablets.sh
@@ -20,7 +20,7 @@
 source ../common/env.sh
 
 for tablet in 100 200 300; do
-  if vtctldclient --action_timeout 1s --server localhost:15999 GetTablet zone1-$tablet >/dev/null 2>&1; then
+  if vtctldclient --action-timeout 1s --server localhost:15999 GetTablet zone1-$tablet >/dev/null 2>&1; then
     # The zero tablet is up. Try to shutdown 0-2 tablet + mysqlctl
     for i in 0 1 2; do
       uid=$(($tablet + $i))
diff --git a/examples/common/env.sh b/examples/common/env.sh
@@ -54,7 +54,7 @@ if [ "${TOPO}" = "zk2" ]; then
     ZK_SERVER="localhost:21811,localhost:21812,localhost:21813"
     # shellcheck disable=SC2034
     #TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
-    TOPOLOGY_FLAGS="--topo_implementation zk2 --topo_global_server_address ${ZK_SERVER} --topo_global_root /vitess/global"
+    TOPOLOGY_FLAGS="--topo-implementation zk2 --topo-global-server-address ${ZK_SERVER} --topo-global-root /vitess/global"
 
     mkdir -p "${VTDATAROOT}/tmp"
 elif [ "${TOPO}" = "consul" ]; then
@@ -63,12 +63,12 @@ elif [ "${TOPO}" = "consul" ]; then
     CONSUL_HTTP_PORT=8500
     CONSUL_SERVER_PORT=8300
     #TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
-    TOPOLOGY_FLAGS="--topo_implementation consul --topo_global_server_address ${CONSUL_SERVER}:${CONSUL_HTTP_PORT} --topo_global_root vitess/global/"
+    TOPOLOGY_FLAGS="--topo-implementation consul --topo-global-server-address ${CONSUL_SERVER}:${CONSUL_HTTP_PORT} --topo-global-root vitess/global/"
     mkdir -p "${VTDATAROOT}/consul"
 else
     ETCD_SERVER="localhost:2379"
     #TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
-    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"
 fi
diff --git a/examples/common/scripts/mysqlctl-down.sh b/examples/common/scripts/mysqlctl-down.sh
@@ -25,5 +25,5 @@ printf -v alias '%s-%010d' $cell $uid
 echo "Shutting down MySQL for tablet $alias..."
 
  #TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
-mysqlctl --tablet_uid $uid shutdown
+mysqlctl --tablet-uid $uid shutdown
 
diff --git a/examples/common/scripts/mysqlctl-up.sh b/examples/common/scripts/mysqlctl-up.sh
@@ -38,8 +38,8 @@ fi
 #TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 mysqlctl \
  --log_dir $VTDATAROOT/tmp \
- --tablet_uid $uid \
- --mysql_port $mysql_port \
+ --tablet-uid $uid \
+ --mysql-port $mysql_port \
  $action
 
 echo -e "MySQL for tablet $alias is running!"
diff --git a/examples/common/scripts/vtctld-up.sh b/examples/common/scripts/vtctld-up.sh
@@ -27,13 +27,13 @@ echo "Starting vtctld..."
 vtctld \
  $TOPOLOGY_FLAGS \
  --cell $cell \
- --service_map 'grpc-vtctl,grpc-vtctld' \
- --backup_storage_implementation file \
- --file_backup_storage_root $VTDATAROOT/backups \
+ --service-map 'grpc-vtctl,grpc-vtctld' \
+ --backup-storage-implementation file \
+ --file-backup-storage-root $VTDATAROOT/backups \
  --log_dir $VTDATAROOT/tmp \
  --port $vtctld_web_port \
- --grpc_port $grpc_port \
- --pid_file $VTDATAROOT/tmp/vtctld.pid \
+ --grpc-port $grpc_port \
+ --pid-file $VTDATAROOT/tmp/vtctld.pid \
  --pprof-http \
   > $VTDATAROOT/tmp/vtctld.out 2>&1 &
 
diff --git a/examples/common/scripts/vtgate-up.sh b/examples/common/scripts/vtgate-up.sh
@@ -30,18 +30,18 @@ echo "Starting vtgate..."
 vtgate \
   $TOPOLOGY_FLAGS \
   --log_dir $VTDATAROOT/tmp \
-  --log_queries_to_file $VTDATAROOT/tmp/vtgate_querylog.txt \
+  --log-queries-to-file $VTDATAROOT/tmp/vtgate_querylog.txt \
   --port $web_port \
-  --grpc_port $grpc_port \
-  --mysql_server_port $mysql_server_port \
-  --mysql_server_socket_path $mysql_server_socket_path \
+  --grpc-port $grpc_port \
+  --mysql-server-port $mysql_server_port \
+  --mysql-server-socket-path $mysql_server_socket_path \
   --cell $cell \
-  --cells_to_watch $cell \
+  --cells-to-watch $cell \
   --tablet-types-to-wait PRIMARY,REPLICA \
-  --service_map 'grpc-vtgateservice' \
-  --pid_file $VTDATAROOT/tmp/vtgate.pid \
-  --enable_buffer \
-  --mysql_auth_server_impl none \
+  --service-map 'grpc-vtgateservice' \
+  --pid-file $VTDATAROOT/tmp/vtgate.pid \
+  --enable-buffer \
+  --mysql-auth-server-impl none \
   --pprof-http \
   > $VTDATAROOT/tmp/vtgate.out 2>&1 &
 
diff --git a/examples/common/scripts/vttablet-up.sh b/examples/common/scripts/vttablet-up.sh
@@ -39,21 +39,21 @@ echo "Starting vttablet for $alias..."
 vttablet \
  $TOPOLOGY_FLAGS \
  --log_dir $VTDATAROOT/tmp \
- --log_queries_to_file $VTDATAROOT/tmp/$tablet_logfile \
+ --log-queries-to-file $VTDATAROOT/tmp/$tablet_logfile \
  --tablet-path $alias \
- --tablet_hostname "$tablet_hostname" \
- --init_keyspace $keyspace \
- --init_shard $shard \
- --init_tablet_type $tablet_type \
- --health_check_interval 5s \
- --backup_storage_implementation file \
- --file_backup_storage_root $VTDATAROOT/backups \
- --restore_from_backup \
+ --tablet-hostname "$tablet_hostname" \
+ --init-keyspace $keyspace \
+ --init-shard $shard \
+ --init-tablet-type $tablet_type \
+ --health-check-interval 5s \
+ --backup-storage-implementation file \
+ --file-backup-storage-root $VTDATAROOT/backups \
+ --restore-from-backup \
  --port $port \
- --grpc_port $grpc_port \
- --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \
- --pid_file $VTDATAROOT/$tablet_dir/vttablet.pid \
- --heartbeat_on_demand_duration=5s \
+ --grpc-port $grpc_port \
+ --service-map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \
+ --pid-file $VTDATAROOT/$tablet_dir/vttablet.pid \
+ --heartbeat-on-demand-duration=5s \
  --pprof-http \
  > $VTDATAROOT/$tablet_dir/vttablet.out 2>&1 &
 
diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml
@@ -68,7 +68,7 @@ services:
         --cell $CELL \
         --service-map 'grpc-vtctl,grpc-vtctld' \
         --backup-storage-implementation file \
-        --file_backup_storage_root /vt/vtdataroot/backups \
+        --file-backup-storage-root /vt/vtdataroot/backups \
         --logtostderr=true \
         --port $WEB_PORT \
         --grpc-port $GRPC_PORT
@@ -98,10 +98,10 @@ services:
         --mysql-server-port $MYSQL_PORT \
         --mysql-auth-server-impl none \
         --cell $CELL \
-        --cells_to_watch $CELL \
+        --cells-to-watch $CELL \
         --tablet-types-to-wait PRIMARY,REPLICA \
         --service-map 'grpc-vtgateservice' \
-        --enable_system_settings=true \
+        --enable-system-settings=true \
         "]
     volumes:
       - ".:/script"
diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
@@ -138,7 +138,7 @@ services:
     - -c
     - ' /vt/bin/vtctld --topo-implementation consul --topo-global-server-address consul1:8500
       --topo-global-root vitess/global --cell test
-      --service-map ''grpc-vtctl,grpc-vtctld'' --backup-storage-implementation file --file_backup_storage_root
+      --service-map ''grpc-vtctl,grpc-vtctld'' --backup-storage-implementation file --file-backup-storage-root
       /vt/vtdataroot/backups --logtostderr=true --port 8080 --grpc-port 15999 '
     depends_on:
       external_db_host:
@@ -155,7 +155,7 @@ services:
     - -c
     - '/script/run-forever.sh /vt/bin/vtgate --topo-implementation consul --topo-global-server-address
       consul1:8500 --topo-global-root vitess/global --logtostderr=true --port 8080 --grpc-port
-      15999 --mysql-server-port 15306 --mysql-auth-server-impl none --cell test --cells_to_watch
+      15999 --mysql-server-port 15306 --mysql-auth-server-impl none --cell test --cells-to-watch
       test --tablet-types-to-wait PRIMARY,REPLICA,RDONLY --service-map ''grpc-vtgateservice''
       --normalize-queries=true '
     depends_on:
diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml
@@ -154,7 +154,7 @@ services:
       - ' /vt/bin/vtctld --topo-implementation consul --topo-global-server-address consul1:8500
         --topo-global-root vitess/global --cell test
         --service-map ''grpc-vtctl,grpc-vtctld'' --backup-storage-implementation file
-        --file_backup_storage_root /vt/vtdataroot/backups --logtostderr=true --port
+        --file-backup-storage-root /vt/vtdataroot/backups --logtostderr=true --port
         8080 --grpc-port 15999 '
     depends_on:
       external_db_host:
@@ -172,7 +172,7 @@ services:
       - '/script/run-forever.sh /vt/bin/vtgate --topo-implementation consul --topo-global-server-address
         consul1:8500 --topo-global-root vitess/global --logtostderr=true --port 8080
         --grpc-port 15999 --mysql-server-port 15306 --mysql-auth-server-impl none --cell
-        test --cells_to_watch test --tablet-types-to-wait PRIMARY,REPLICA,RDONLY --service-map
+        test --cells-to-watch test --tablet-types-to-wait PRIMARY,REPLICA,RDONLY --service-map
         ''grpc-vtgateservice'' --normalize-queries=true '
     depends_on:
       - vtctld
diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go
@@ -634,7 +634,7 @@ func generateVtctld(opts vtOptions) string {
         --cell %[4]s \
         --service-map 'grpc-vtctl,grpc-vtctld' \
         --backup-storage-implementation file \
-        --file_backup_storage_root /vt/vtdataroot/backups \
+        --file-backup-storage-root /vt/vtdataroot/backups \
         --logtostderr=true \
         --port %[1]d \
         --grpc-port %[2]d \
@@ -669,7 +669,7 @@ func generateVtgate(opts vtOptions) string {
         --mysql-server-port %[3]d \
         --mysql-auth-server-impl none \
         --cell %[5]s \
-        --cells_to_watch %[5]s \
+        --cells-to-watch %[5]s \
         --tablet-types-to-wait PRIMARY,REPLICA,RDONLY \
         --service-map 'grpc-vtgateservice' \
         --normalize-queries=true \
diff --git a/examples/compose/vttablet-up.sh b/examples/compose/vttablet-up.sh
@@ -99,9 +99,9 @@ rm -rf $VTDATAROOT/$tablet_dir/{mysql.sock,mysql.sock.lock}
 if [[ $tablet_role != "externalprimary" ]]; then
   echo "Initing mysql for tablet: $uid role: $role external: $external.. "
   $VTROOT/bin/mysqlctld \
-  --init_db_sql_file=$init_db_sql_file \
+  --init-db-sql-file=$init_db_sql_file \
   --logtostderr=true \
-  --tablet_uid=$uid \
+  --tablet-uid=$uid \
   &
 fi
 
@@ -114,33 +114,33 @@ $VTROOT/bin/vtctldclient --server vtctld:$GRPC_PORT AddCellInfo --root vitess/$C
 #Populate external db conditional args
 if [ $tablet_role = "externalprimary" ]; then
     echo "Setting external db args for primary: $DB_NAME"
-    external_db_args="--db_host $DB_HOST \
-                      --db_port $DB_PORT \
-                      --init_db_name_override $DB_NAME \
-                      --init_tablet_type $tablet_type \
-                      --mycnf_server_id $uid \
-                      --db_app_user $DB_USER \
-                      --db_app_password $DB_PASS \
-                      --db_allprivs_user $DB_USER \
-                      --db_allprivs_password $DB_PASS \
-                      --db_appdebug_user $DB_USER \
-                      --db_appdebug_password $DB_PASS \
-                      --db_dba_user $DB_USER \
-                      --db_dba_password $DB_PASS \
-                      --db_filtered_user $DB_USER \
-                      --db_filtered_password $DB_PASS \
-                      --db_repl_user $DB_USER \
-                      --db_repl_password $DB_PASS \
-                      --enable_replication_reporter=false \
-                      --enforce_strict_trans_tables=false \
-                      --track_schema_versions=true \
-                      --vreplication_tablet_type=primary \
-                      --watch_replication_stream=true"
+    external_db_args="--db-host $DB_HOST \
+                      --db-port $DB_PORT \
+                      --init-db-name-override $DB_NAME \
+                      --init-tablet-type $tablet_type \
+                      --mycnf-server-id $uid \
+                      --db-app-user $DB_USER \
+                      --db-app-password $DB_PASS \
+                      --db-allprivs-user $DB_USER \
+                      --db-allprivs-password $DB_PASS \
+                      --db-appdebug-user $DB_USER \
+                      --db-appdebug-password $DB_PASS \
+                      --db-dba-user $DB_USER \
+                      --db-dba-password $DB_PASS \
+                      --db-filtered-user $DB_USER \
+                      --db-filtered-password $DB_PASS \
+                      --db-repl-user $DB_USER \
+                      --db-repl-password $DB_PASS \
+                      --enable-replication-reporter=false \
+                      --enforce-strict-trans-tables=false \
+                      --track-schema-versions=true \
+                      --vreplication-tablet-type=primary \
+                      --watch-replication-stream=true"
 else
-    external_db_args="--init_db_name_override $DB_NAME \
-                      --init_tablet_type $tablet_type \
-                      --enable_replication_reporter=true \
-                      --restore_from_backup"
+    external_db_args="--init-db-name-override $DB_NAME \
+                      --init-tablet-type $tablet_type \
+                      --enable-replication-reporter=true \
+                      --restore-from-backup"
 fi
 
 #TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
@@ -149,14 +149,14 @@ exec $VTROOT/bin/vttablet \
   $TOPOLOGY_FLAGS \
   --logtostderr=true \
   --tablet-path $alias \
-  --tablet_hostname "$vthost" \
-  --health_check_interval 5s \
+  --tablet-hostname "$vthost" \
+  --health-check-interval 5s \
   --port $web_port \
-  --grpc_port $grpc_port \
-  --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \
-  --init_keyspace $keyspace \
-  --init_shard $shard \
-  --backup_storage_implementation file \
-  --file_backup_storage_root $VTDATAROOT/backups \
+  --grpc-port $grpc_port \
+  --service-map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \
+  --init-keyspace $keyspace \
+  --init-shard $shard \
+  --backup-storage-implementation file \
+  --file-backup-storage-root $VTDATAROOT/backups \
   --queryserver-config-schema-reload-time 60s \
   $external_db_args
diff --git a/examples/local/501_teardown.sh b/examples/local/501_teardown.sh
@@ -26,7 +26,7 @@ source ../common/env.sh
 ../common/scripts/vtgate-down.sh
 
 for tablet in 100 200 300 400; do
-	if vtctldclient --action_timeout 1s --server localhost:15999 GetTablet zone1-$tablet >/dev/null 2>&1; then
+	if vtctldclient --action-timeout 1s --server localhost:15999 GetTablet zone1-$tablet >/dev/null 2>&1; then
 		# The zero tablet is up. Try to shutdown 0-2 tablet + mysqlctl
 		for i in 0 1 2; do
 			uid=$((tablet + i))
