Merge remote-tracking branch 'origin/master' into mtocker-virtual-shards-new2

* origin/master:
  bugfix: Fix impossible query for UNION (vitessio#18463)
  fix topo use in local_example (vitessio#18357)
  fix: update go-upgrade tool to check patch number (vitessio#18252) (vitessio#18402)
  Update MAINTAINERS.md and CODEOWNERS (vitessio#18462)
  Add logging to binlog watcher actions (vitessio#18264)
  `schemadiff`: `RelatedForeignKeyTables()` (vitessio#18195)
  `vtorc`: allow recoveries to be disabled from startup (vitessio#18005)
  Fix `vttablet` not being marked as not serving when MySQL stalls (vitessio#17883)
  make xtrabackup ShouldDrainForBackup configurable (vitessio#18431)

Signed-off-by: Morgan Tocker <[email protected]>

Author: morgo

.github/CODEOWNERS

@@ -1,77 +1,76 @@
-* @deepthi
-bootstrap.sh @deepthi @frouioui
-go.mod @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
-go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
-/.github/ @deepthi @mattlord @rohit-nayak-ps @frouioui
-/.github/ISSUE_TEMPLATE/ @deepthi @frouioui @mattlord
-/.github/workflows/ @deepthi @frouioui @mattlord @rohit-nayak-ps
-/config/mycnf/ @deepthi @shlomi-noach @mattlord
-/doc/ @deepthi @frouioui @GuptaManan100
-/docker/ @deepthi @derekperkins @mattlord @GuptaManan100 @frouioui
+bootstrap.sh @frouioui
+go.mod @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
+go.sum @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
+/.github/ @mattlord @rohit-nayak-ps @frouioui
+/.github/ISSUE_TEMPLATE/ @frouioui @mattlord
+/.github/workflows/ @frouioui @mattlord @rohit-nayak-ps
+/config/mycnf/ @shlomi-noach @mattlord
+/doc/ @frouioui @GuptaManan100
+/docker/ @derekperkins @mattlord @GuptaManan100 @frouioui
 /examples/compose @shlomi-noach @GuptaManan100 @frouioui
 /examples/demo @mattlord @rohit-nayak-ps
 /examples/local @rohit-nayak-ps @frouioui @mattlord @GuptaManan100
 /examples/operator @GuptaManan100 @frouioui @mattlord
-/examples/region_sharding @deepthi @mattlord
+/examples/region_sharding @mattlord
 /java/ @harshit-gangal
-/go/cmd @deepthi @mattlord
+/go/cmd @mattlord
 /go/cmd/vtadmin @notfelineit
 /go/cmd/vtctldclient @mattlord @notfelineit
 /go/cmd/vtctldclient/command/throttler.go @shlomi-noach @mattlord
 /go/cmd/vtctldclient/command/vreplication @mattlord @rohit-nayak-ps @shlomi-noach @notfelineit
 /go/cmd/vtctldclient/command/backups.go @frouioui @mattlord
-/go/cmd/vtbackup @frouioui @deepthi
+/go/cmd/vtbackup @frouioui
 /go/internal/flag @rohit-nayak-ps
 /go/mysql @harshit-gangal @systay @mattlord
-/go/pools @deepthi @harshit-gangal
-/go/protoutil @deepthi @mattlord
+/go/pools @harshit-gangal
+/go/protoutil @mattlord
 /go/sqltypes @harshit-gangal @shlomi-noach
 /go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
 /go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
 /go/test/endtoend/schemadiff @shlomi-noach @mattlord
 /go/test/endtoend/transaction @harshit-gangal @systay @frouioui @GuptaManan100
 /go/test/endtoend/*throttler* @shlomi-noach @mattlord @timvaillancourt
 /go/test/endtoend/vtgate @harshit-gangal @systay @frouioui
-/go/test/endtoend/vtorc @deepthi @shlomi-noach @GuptaManan100 @timvaillancourt
+/go/test/endtoend/vtorc @shlomi-noach @GuptaManan100 @timvaillancourt
 /go/tools/ @frouioui @systay
 /go/vt/dbconnpool @harshit-gangal @mattlord
-/go/vt/discovery @deepthi @frouioui
+/go/vt/discovery @frouioui
 /go/vt/discovery/*tablet_picker* @rohit-nayak-ps @mattlord
-/go/vt/mysqlctl @deepthi @mattlord @frouioui
-/go/vt/proto @deepthi @harshit-gangal @mattlord
+/go/vt/mysqlctl @mattlord @frouioui
+/go/vt/proto @harshit-gangal @mattlord
 /go/vt/proto/vtadmin @notfelineit
 /go/vt/schema @mattlord @shlomi-noach
-/go/vt/servenv @deepthi @dbussink
+/go/vt/servenv @dbussink
 /go/vt/schemadiff @shlomi-noach @mattlord
 /go/vt/sqlparser @harshit-gangal @systay @GuptaManan100
-/go/vt/srvtopo @deepthi @mattlord
+/go/vt/srvtopo @mattlord
 /go/vt/sysvars @harshit-gangal @systay
-/go/vt/topo @deepthi @mattlord
-/go/vt/topotools @deepthi @mattlord
+/go/vt/topo @mattlord
+/go/vt/topotools @mattlord
 /go/vt/vitessdriver @harshit-gangal
 /go/vt/vtadmin @notfelineit @rohit-nayak-ps
-/go/vt/vtctl @deepthi @rohit-nayak-ps
+/go/vt/vtctl @rohit-nayak-ps
 /go/vt/vtctl/vtctl.go @notfelineit @rohit-nayak-ps
 /go/vt/vtctl/grpcvtctldclient @notfelineit @mattlord
 /go/vt/vtctl/grpcvtctldserver @notfelineit @mattlord
-/go/vt/vtctl/reparentutil @GuptaManan100 @deepthi
+/go/vt/vtctl/reparentutil @GuptaManan100
 /go/vt/vtctl/vtctldclient @notfelineit @mattlord
-/go/vt/vtctld @deepthi @notfelineit @rohit-nayak-ps @mattlord
+/go/vt/vtctld @notfelineit @rohit-nayak-ps @mattlord
 /go/vt/vterrors @harshit-gangal @systay @frouioui
 /go/vt/vtexplain @systay @harshit-gangal
 /go/vt/vtgate @harshit-gangal @systay @frouioui @GuptaManan100
 /go/vt/vtgate/endtoend/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @notfelineit
 /go/vt/vtgate/planbuilder @harshit-gangal @systay @frouioui @GuptaManan100 @arthurschreiber
 /go/vt/vtgate/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @notfelineit
 /go/vt/vtgate/evalengine @dbussink @systay
-/go/vt/vtorc @deepthi @shlomi-noach @GuptaManan100 @timvaillancourt
+/go/vt/vtorc @shlomi-noach @GuptaManan100 @timvaillancourt
 /go/vt/vttablet/*conn* @harshit-gangal @systay
 /go/vt/vttablet/endtoend @harshit-gangal @mattlord @rohit-nayak-ps @systay
 /go/vt/vttablet/grpc* @rohit-nayak-ps @shlomi-noach @harshit-gangal
 /go/vt/vttablet/onlineddl @mattlord @rohit-nayak-ps @shlomi-noach @notfelineit
 /go/vt/vttablet/queryservice @harshit-gangal @systay
-/go/vt/vttablet/tabletmanager @deepthi @GuptaManan100 @rohit-nayak-ps @shlomi-noach
-/go/vt/vttablet/tabletmanager/rpc_backup.go @deepthi @GuptaManan100 @rohit-nayak-ps @shlomi-noach @frouioui
+/go/vt/vttablet/tabletmanager @GuptaManan100 @rohit-nayak-ps @shlomi-noach
+/go/vt/vttablet/tabletmanager/rpc_backup.go @GuptaManan100 @rohit-nayak-ps @shlomi-noach @frouioui
 /go/vt/vttablet/tabletmanager/rpc_throttler.go @shlomi-noach @mattlord @timvaillancourt
 /go/vt/vttablet/tabletserver/throttle @shlomi-noach @mattlord @timvaillancourt
 /go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord @shlomi-noach @notfelineit
@@ -81,13 +80,13 @@ go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 /go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
 /go/vt/vttablet/*tmclient* @GuptaManan100 @rohit-nayak-ps @shlomi-noach
 /go/vt/vttablet/vexec @mattlord @rohit-nayak-ps @shlomi-noach
-/go/vt/wrangler @deepthi @mattlord @rohit-nayak-ps
+/go/vt/wrangler @mattlord @rohit-nayak-ps
 /go/vt/vtctl/workflow @mattlord @rohit-nayak-ps @shlomi-noach @notfelineit
-/proto/ @deepthi @harshit-gangal
+/proto/ @harshit-gangal
 /proto/vtadmin.proto @notfelineit @mattlord
 /proto/vtctldata.proto @notfelineit @mattlord
 /proto/vtctlservice.proto @notfelineit @mattlord
-/test/ @GuptaManan100 @frouioui @rohit-nayak-ps @deepthi @mattlord @harshit-gangal
+/test/ @GuptaManan100 @frouioui @rohit-nayak-ps @mattlord @harshit-gangal
 /tools/ @frouioui @rohit-nayak-ps
 /web/vtadmin @notfelineit
-/web/vtadmin/src/proto @deepthi @harshit-gangal @mattlord @notfelineit
+/web/vtadmin/src/proto @harshit-gangal @mattlord @notfelineit

.github/workflows/local_example.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: gh-hosted-runners-16cores-1-24.04
     strategy:
       matrix:
-        topo: [consul,etcd,zk2]
+        topo: [etcd,zk2]
 
     steps:
     - name: Skip CI

MAINTAINERS.md

@@ -4,7 +4,6 @@ The following is the full list, alphabetically ordered.
 
 * Andres Taylor ([systay](https://github.com/systay)) [email protected]
 * Arthur Schreiber ([arthurschreiber](https://github.com/arthurschreiber)) [email protected]
-* Deepthi Sigireddi ([deepthi](https://github.com/deepthi)) [email protected]
 * Derek Perkins ([derekperkins](https://github.com/derekperkins)) [email protected]
 * Dirkjan Bussink ([dbussink](https://github.com/dbussink)) [email protected]
 * Florent Poinsard ([frouioui](https://github.com/frouioui)) [email protected]
@@ -19,13 +18,13 @@ The following is the full list, alphabetically ordered.
 ## Areas of expertise
 
 ### General Vitess
-deepthi, mattlord, derekperkins
+mattlord, derekperkins
 
 ### Builds
 shlomi-noach, GuptaManan100, frouioui
 
 ### Resharding
-rohit-nayak-ps, deepthi, mattlord
+rohit-nayak-ps, mattlord
 
 ### Parser
 systay, harshit-gangal, vmg, GuptaManan100, dbussink
@@ -43,7 +42,7 @@ systay, harshit-gangal, GuptaManan100, frouioui, dbussink
 shlomi-noach, dbussink
 
 ### Cluster Management
-deepthi, GuptaManan100, dbussink
+GuptaManan100, dbussink
 
 ### Java
 harshit-gangal
@@ -66,6 +65,7 @@ We thank the following past maintainers for their contributions.
 * Anthony Yeh ([enisoc](https://github.com/enisoc))
 * Dan Kozlowski ([dkhenry](https://github.com/dkhenry))
 * David Weitzman ([dweitzman](https://github.com/dweitzman))
+* Deepthi Sigireddi ([deepthi](https://github.com/deepthi))
 * Jon Tirsen ([tirsen](https://github.com/tirsen))
 * Leo X. Lin ([leoxlin](https://github.com/leoxlin))
 * Mali Akmanalp ([makmanalp](https://github.com/makmanalp)

docker/test/run.sh

@@ -141,6 +141,10 @@ args="$args -v /tmp/mavencache:/home/vitess/.m2"
 args="$args --user vitess"
 args="$args -v $PWD/test/bin:/tmp/bin"
 
+# Pass through TOPO environment variable if it's set
+if [[ -n "$TOPO" ]]; then
+  args="$args -e TOPO=$TOPO"
+fi
 # Mount in host VTDATAROOT if one exists, since it might be a RAM disk or SSD.
 if [[ -n "$VTDATAROOT" ]]; then
   hostdir=`mktemp -d $VTDATAROOT/test-XXX`

examples/common/scripts/zk-down.sh

@@ -18,6 +18,10 @@
 
 source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 
+# Explicitly set VTROOT for this script, since it requires it.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+export VTROOT=${VTROOT:-$(cd "$SCRIPT_DIR/../../.." && pwd)}
+
 # Stop ZooKeeper servers.
 echo "Stopping zk servers..."
 for zkid in $zkids; do

examples/common/scripts/zk-up.sh

@@ -18,6 +18,10 @@
 
 source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 
+# Explicitly set VTROOT for this script, since it requires it.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+export VTROOT=${VTROOT:-$(cd "$SCRIPT_DIR/../../.." && pwd)}
+
 cell=${CELL:-'test'}
 # Start ZooKeeper servers.
 # The "zkctl init" command won't return until the server is able to contact its

go/flags/endtoend/vtbackup.txt

@@ -253,6 +253,7 @@ Flags:
       --xtrabackup-backup-flags string                              Flags to pass to backup command. These should be space separated and will be added to the end of the command
       --xtrabackup-prepare-flags string                             Flags to pass to prepare command. These should be space separated and will be added to the end of the command
       --xtrabackup-root-path string                                 Directory location of the xtrabackup and xbstream executables, e.g., /usr/bin
+      --xtrabackup-should-drain                                     Decide if we should drain while taking a backup or continue to serving traffic
       --xtrabackup-stream-mode string                               Which mode to use if streaming, valid values are tar and xbstream. Please note that tar is not supported in XtraBackup 8.0 (default "tar")
       --xtrabackup-stripe-block-size uint                           Size in bytes of each block that gets sent to a given stripe before rotating to the next stripe (default 102400)
       --xtrabackup-stripes uint                                     If greater than 0, use data striping across this many destination files to parallelize data transfer and decompression

go/flags/endtoend/vtcombo.txt

@@ -444,6 +444,7 @@ Flags:
       --xtrabackup-backup-flags string                                   Flags to pass to backup command. These should be space separated and will be added to the end of the command
       --xtrabackup-prepare-flags string                                  Flags to pass to prepare command. These should be space separated and will be added to the end of the command
       --xtrabackup-root-path string                                      Directory location of the xtrabackup and xbstream executables, e.g., /usr/bin
+      --xtrabackup-should-drain                                          Decide if we should drain while taking a backup or continue to serving traffic
       --xtrabackup-stream-mode string                                    Which mode to use if streaming, valid values are tar and xbstream. Please note that tar is not supported in XtraBackup 8.0 (default "tar")
       --xtrabackup-stripe-block-size uint                                Size in bytes of each block that gets sent to a given stripe before rotating to the next stripe (default 102400)
       --xtrabackup-stripes uint                                          If greater than 0, use data striping across this many destination files to parallelize data transfer and decompression

go/flags/endtoend/vtorc.txt

@@ -16,6 +16,7 @@ vtorc \
 
 Flags:
       --allow-emergency-reparent                                    Whether VTOrc should be allowed to run emergency reparent operation when it detects a dead primary (default true)
+      --allow-recovery                                              Whether VTOrc should be allowed to run recovery actions (default true)
       --alsologtostderr                                             log to standard error as well as files
       --audit-file-location string                                  File location where the audit logs are to be stored
       --audit-purge-duration duration                               Duration for which audit logs are held before being purged. Should be in multiples of days (default 168h0m0s)

go/flags/endtoend/vttablet.txt

@@ -431,6 +431,7 @@ Flags:
       --xtrabackup-backup-flags string                                   Flags to pass to backup command. These should be space separated and will be added to the end of the command
       --xtrabackup-prepare-flags string                                  Flags to pass to prepare command. These should be space separated and will be added to the end of the command
       --xtrabackup-root-path string                                      Directory location of the xtrabackup and xbstream executables, e.g., /usr/bin
+      --xtrabackup-should-drain                                          Decide if we should drain while taking a backup or continue to serving traffic
       --xtrabackup-stream-mode string                                    Which mode to use if streaming, valid values are tar and xbstream. Please note that tar is not supported in XtraBackup 8.0 (default "tar")
       --xtrabackup-stripe-block-size uint                                Size in bytes of each block that gets sent to a given stripe before rotating to the next stripe (default 102400)
       --xtrabackup-stripes uint                                          If greater than 0, use data striping across this many destination files to parallelize data transfer and decompression