Merge remote-tracking branch 'upstream/main' into vtgate-metrics

Signed-off-by: Harshit Gangal <[email protected]>

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 * @deepthi
-bootstrap.sh @ajm188 @deepthi @frouioui @vmg
-go.mod @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
-go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
+bootstrap.sh @deepthi @frouioui @vmg
+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
@@ -15,15 +15,15 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /examples/region_sharding @deepthi @mattlord
 /java/ @harshit-gangal
 /go/cache @vmg
-/go/cmd @ajm188 @deepthi @mattlord
-/go/cmd/vtadmin @ajm188 @notfelineit
-/go/cmd/vtctldclient @ajm188 @mattlord
+/go/cmd @deepthi @mattlord
+/go/cmd/vtadmin @notfelineit
+/go/cmd/vtctldclient @mattlord
 /go/cmd/vtctldclient/command/throttler.go @shlomi-noach @mattlord
 /go/cmd/vtctldclient/command/vreplication @mattlord @rohit-nayak-ps
-/go/internal/flag @ajm188 @rohit-nayak-ps
+/go/internal/flag @rohit-nayak-ps
 /go/mysql @harshit-gangal @systay @mattlord
 /go/pools @deepthi @harshit-gangal
-/go/protoutil @ajm188 @deepthi @mattlord
+/go/protoutil @deepthi @mattlord
 /go/sqltypes @harshit-gangal @shlomi-noach @vmg
 /go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
 /go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
@@ -38,34 +38,35 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/discovery/*tablet_picker* @rohit-nayak-ps @mattlord
 /go/vt/mysqlctl @deepthi @mattlord
 /go/vt/proto @deepthi @harshit-gangal @mattlord
-/go/vt/proto/vtadmin @ajm188 @notfelineit
+/go/vt/proto/vtadmin @notfelineit
 /go/vt/schema @mattlord @shlomi-noach
-/go/vt/servenv @deepthi @ajm188
+/go/vt/servenv @deepthi @dbussink
 /go/vt/schemadiff @shlomi-noach @mattlord
 /go/vt/sqlparser @harshit-gangal @systay @GuptaManan100
 /go/vt/srvtopo @deepthi @mattlord
 /go/vt/sysvars @harshit-gangal @systay
 /go/vt/topo @deepthi @mattlord
 /go/vt/topotools @deepthi @mattlord
 /go/vt/vitessdriver @harshit-gangal
-/go/vt/vtadmin @ajm188 @notfelineit @rohit-nayak-ps
-/go/vt/vtctl @ajm188 @deepthi @rohit-nayak-ps
+/go/vt/vtadmin @notfelineit @rohit-nayak-ps
+/go/vt/vtctl @deepthi @rohit-nayak-ps
 /go/vt/vtctl/vtctl.go @notfelineit @rohit-nayak-ps
-/go/vt/vtctl/grpcvtctldclient @ajm188 @notfelineit @mattlord
-/go/vt/vtctl/grpcvtctldserver @ajm188 @notfelineit @mattlord
-/go/vt/vtctl/reparentutil @ajm188 @GuptaManan100 @deepthi
-/go/vt/vtctl/vtctldclient @ajm188 @notfelineit @mattlord
-/go/vt/vtctld @ajm188 @deepthi @notfelineit @rohit-nayak-ps @mattlord
+/go/vt/vtctl/grpcvtctldclient @notfelineit @mattlord
+/go/vt/vtctl/grpcvtctldserver @notfelineit @mattlord
+/go/vt/vtctl/reparentutil @GuptaManan100 @deepthi
+/go/vt/vtctl/vtctldclient @notfelineit @mattlord
+/go/vt/vtctld @deepthi @notfelineit @rohit-nayak-ps @mattlord
 /go/vt/vterrors @harshit-gangal @systay
 /go/vt/vtexplain @systay @harshit-gangal
 /go/vt/vtgate @harshit-gangal @systay @frouioui @GuptaManan100
 /go/vt/vtgate/endtoend/*vstream* @rohit-nayak-ps @mattlord
 /go/vt/vtgate/planbuilder @harshit-gangal @systay @frouioui @GuptaManan100 @arthurschreiber
 /go/vt/vtgate/*vstream* @rohit-nayak-ps @mattlord
+/go/vt/vtgate/evalengine @dbussink @vmg @systay
 /go/vt/vtorc @deepthi @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* @ajm188 @rohit-nayak-ps @shlomi-noach @harshit-gangal
+/go/vt/vttablet/grpc* @rohit-nayak-ps @shlomi-noach @harshit-gangal
 /go/vt/vttablet/onlineddl @mattlord @rohit-nayak-ps @shlomi-noach
 /go/vt/vttablet/queryservice @harshit-gangal @systay
 /go/vt/vttablet/tabletmanager @deepthi @GuptaManan100 @rohit-nayak-ps @shlomi-noach
@@ -76,15 +77,15 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord
 /go/vt/vttablet/tabletserver* @harshit-gangal @systay @shlomi-noach @rohit-nayak-ps @timvaillancourt
 /go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
-/go/vt/vttablet/*tmclient* @ajm188 @GuptaManan100 @rohit-nayak-ps @shlomi-noach
+/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/vtctl/workflow @mattlord @rohit-nayak-ps
 /proto/ @deepthi @harshit-gangal
-/proto/vtadmin.proto @ajm188 @notfelineit @mattlord
-/proto/vtctldata.proto @ajm188 @notfelineit @mattlord
-/proto/vtctlservice.proto @ajm188 @notfelineit @mattlord
+/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
 /tools/ @frouioui @rohit-nayak-ps
-/web/vtadmin @ajm188 @notfelineit
+/web/vtadmin @notfelineit
 /web/vtadmin/src/proto @deepthi @harshit-gangal @mattlord

MAINTAINERS.md

@@ -3,7 +3,6 @@ This page lists all active maintainers and their areas of expertise. This can be
 The following is the full list, alphabetically ordered.
 
 * Andres Taylor ([systay](https://github.com/systay)) [email protected]
-* Andrew Mason ([amason](https://github.com/ajm188)) [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]
@@ -24,7 +23,7 @@ The following is the full list, alphabetically ordered.
 deepthi, mattlord, derekperkins
 
 ### Builds
-shlomi-noach, ajm188, vmg, GuptaManan100, frouioui
+shlomi-noach, vmg, GuptaManan100, frouioui
 
 ### Resharding
 rohit-nayak-ps, deepthi, mattlord
@@ -33,7 +32,7 @@ rohit-nayak-ps, deepthi, mattlord
 systay, harshit-gangal, vmg, GuptaManan100, dbussink
 
 ### Evaluation Engine
-vmg
+vmg, dbussink, systay
 
 ### Planner
 systay, harshit-gangal, GuptaManan100, frouioui 
@@ -48,7 +47,7 @@ shlomi-noach, dbussink
 vmg
 
 ### Cluster Management
-deepthi, ajm188, GuptaManan100, dbussink
+deepthi, GuptaManan100, dbussink
 
 ### Java
 harshit-gangal
@@ -57,7 +56,7 @@ harshit-gangal
 derekperkins, GuptaManan100, frouioui
 
 ### VTAdmin
-ajm188, notfelineit
+notfelineit, rohit-nayak-ps
 
 ### Messaging
 derekperkins, mattlord
@@ -67,6 +66,7 @@ We thank the following past maintainers for their contributions.
 
 * Alain Jobart ([alainjobart](https://github.com/alainjobart))
 * Alkin Tezuysal ([askdba](https://github.com/askdba))
+* Andrew Mason ([ajm188](https://github.com/ajm188))
 * Anthony Yeh ([enisoc](https://github.com/enisoc))
 * Dan Kozlowski ([dkhenry](https://github.com/dkhenry))
 * David Weitzman ([dweitzman](https://github.com/dweitzman))

changelog/19.0/19.0.10/changelog.md

@@ -0,0 +1,26 @@
+# Changelog of Vitess v19.0.10
+
+### Bug fixes 
+#### Backup and Restore
+ * [release-19.0] Replace uses of os.Create with os2.Create within backup/restore workflows (#17648) [#17664](https://github.com/vitessio/vitess/pull/17664) 
+#### Query Serving
+ * [release-19.0] Fix panic inside schema tracker (#17659) [#17671](https://github.com/vitessio/vitess/pull/17671)
+ * [release-19.0] smartconnpool: do not allow connections to starve (#17675) [#17683](https://github.com/vitessio/vitess/pull/17683) 
+#### VReplication
+ * [release-19.0] VReplication: Address SwitchTraffic bugs around replication lag and cancel on error (#17616) [#17642](https://github.com/vitessio/vitess/pull/17642)
+ * [release-19.0] Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717) [#17746](https://github.com/vitessio/vitess/pull/17746) 
+#### VTGate
+ * [release-19.0] Increase health check buffer size (#17636) [#17639](https://github.com/vitessio/vitess/pull/17639)
+### Dependencies 
+#### Java
+ * [release-19.0] Bump io.netty:netty-handler from 4.1.110.Final to 4.1.118.Final in /java (#17730) [#17731](https://github.com/vitessio/vitess/pull/17731)
+### Enhancement 
+#### VTAdmin
+ * [release-19.0] VTAdmin: update logo and favicon for the new Vitess logos (#17715) [#17723](https://github.com/vitessio/vitess/pull/17723)
+### Internal Cleanup 
+#### VReplication
+ * [release-19.0] Always make sure to escape all strings (#17649) [#17655](https://github.com/vitessio/vitess/pull/17655)
+### Release 
+#### General
+ * [release-19.0] Bump to `v19.0.10-SNAPSHOT` after the `v19.0.9` release [#17596](https://github.com/vitessio/vitess/pull/17596)
+

changelog/19.0/19.0.10/release_notes.md

@@ -0,0 +1,7 @@
+# Release of Vitess v19.0.10
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/19.0/19.0.10/changelog.md).
+
+The release includes 10 merged Pull Requests.
+
+Thanks to all our contributors: @app/vitess-bot, @vitess-bot
+

changelog/19.0/README.md

@@ -1,4 +1,8 @@
 ## v19.0
+* **[19.0.10](19.0.10)**
+	* [Changelog](19.0.10/changelog.md)
+	* [Release Notes](19.0.10/release_notes.md)
+
 * **[19.0.9](19.0.9)**
 	* [Changelog](19.0.9/changelog.md)
 	* [Release Notes](19.0.9/release_notes.md)

changelog/20.0/20.0.6/changelog.md

@@ -0,0 +1,29 @@
+# Changelog of Vitess v20.0.6
+
+### Bug fixes 
+#### Backup and Restore
+ * [release-20.0] Replace uses of os.Create with os2.Create within backup/restore workflows (#17648) [#17665](https://github.com/vitessio/vitess/pull/17665) 
+#### Query Serving
+ * [release-20.0] Fix panic inside schema tracker (#17659) [#17672](https://github.com/vitessio/vitess/pull/17672)
+ * [release-20.0] smartconnpool: do not allow connections to starve (#17675) [#17684](https://github.com/vitessio/vitess/pull/17684) 
+#### VReplication
+ * [release-20.0] VReplication: Address SwitchTraffic bugs around replication lag and cancel on error (#17616) [#17643](https://github.com/vitessio/vitess/pull/17643)
+ * [release-20.0] VDiff: fix race when a vdiff resumes on vttablet restart (#17638) [#17693](https://github.com/vitessio/vitess/pull/17693)
+ * [release-20.0] Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717) [#17747](https://github.com/vitessio/vitess/pull/17747) 
+#### VTAdmin
+ * [release-20.0] fix SchemaCacheConfig.DefaultExpiration (#17609) [#17611](https://github.com/vitessio/vitess/pull/17611) 
+#### VTGate
+ * [release-20.0] Increase health check buffer size (#17636) [#17640](https://github.com/vitessio/vitess/pull/17640)
+### Dependencies 
+#### Java
+ * [release-20.0] Bump io.netty:netty-handler from 4.1.110.Final to 4.1.118.Final in /java (#17730) [#17732](https://github.com/vitessio/vitess/pull/17732)
+### Enhancement 
+#### VTAdmin
+ * [release-20.0] VTAdmin: update logo and favicon for the new Vitess logos (#17715) [#17724](https://github.com/vitessio/vitess/pull/17724)
+### Internal Cleanup 
+#### VReplication
+ * [release-20.0] Always make sure to escape all strings (#17649) [#17656](https://github.com/vitessio/vitess/pull/17656)
+### Release 
+#### General
+ * [release-20.0] Bump to `v20.0.6-SNAPSHOT` after the `v20.0.5` release [#17598](https://github.com/vitessio/vitess/pull/17598)
+

changelog/20.0/20.0.6/release_notes.md

@@ -0,0 +1,7 @@
+# Release of Vitess v20.0.6
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/20.0/20.0.6/changelog.md).
+
+The release includes 12 merged Pull Requests.
+
+Thanks to all our contributors: @app/vitess-bot, @vitess-bot
+

changelog/20.0/README.md

@@ -1,4 +1,8 @@
 ## v20.0
+* **[20.0.6](20.0.6)**
+	* [Changelog](20.0.6/changelog.md)
+	* [Release Notes](20.0.6/release_notes.md)
+
 * **[20.0.5](20.0.5)**
 	* [Changelog](20.0.5/changelog.md)
 	* [Release Notes](20.0.5/release_notes.md)

changelog/21.0/21.0.3/changelog.md

@@ -0,0 +1,30 @@
+# Changelog of Vitess v21.0.3
+
+### Bug fixes 
+#### Backup and Restore
+ * [release-21.0] Replace uses of os.Create with os2.Create within backup/restore workflows (#17648) [#17666](https://github.com/vitessio/vitess/pull/17666) 
+#### Query Serving
+ * [release-21.0] Fix how we generate the query serving error documentation (#17516) [#17536](https://github.com/vitessio/vitess/pull/17536)
+ * [release-21.0] Fix panic inside schema tracker (#17659) [#17673](https://github.com/vitessio/vitess/pull/17673)
+ * [release-21.0] smartconnpool: do not allow connections to starve (#17675) [#17685](https://github.com/vitessio/vitess/pull/17685) 
+#### VReplication
+ * [release-21.0] VReplication: Address SwitchTraffic bugs around replication lag and cancel on error (#17616) [#17644](https://github.com/vitessio/vitess/pull/17644)
+ * [release-21.0] VDiff: fix race when a vdiff resumes on vttablet restart (#17638) [#17694](https://github.com/vitessio/vitess/pull/17694)
+ * [release-21.0] Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717) [#17748](https://github.com/vitessio/vitess/pull/17748) 
+#### VTAdmin
+ * [release-21.0] fix SchemaCacheConfig.DefaultExpiration (#17609) [#17612](https://github.com/vitessio/vitess/pull/17612) 
+#### VTGate
+ * [release-21.0] Increase health check buffer size [#17636](https://github.com/vitessio/vitess/pull/17636)
+### Dependencies 
+#### Java
+ * [release-21.0] Bump io.netty:netty-handler from 4.1.110.Final to 4.1.118.Final in /java (#17730) [#17733](https://github.com/vitessio/vitess/pull/17733)
+### Enhancement 
+#### VTAdmin
+ * [release-21.0] VTAdmin: update logo and favicon for the new Vitess logos (#17715) [#17725](https://github.com/vitessio/vitess/pull/17725)
+### Internal Cleanup 
+#### VReplication
+ * [release-21.0] Always make sure to escape all strings (#17649) [#17657](https://github.com/vitessio/vitess/pull/17657)
+### Release 
+#### General
+ * [release-21.0] Bump to `v21.0.3-SNAPSHOT` after the `v21.0.2` release [#17600](https://github.com/vitessio/vitess/pull/17600)
+

changelog/21.0/21.0.3/release_notes.md

@@ -0,0 +1,7 @@
+# Release of Vitess v21.0.3
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/21.0/21.0.3/changelog.md).
+
+The release includes 13 merged Pull Requests.
+
+Thanks to all our contributors: @GuptaManan100, @app/vitess-bot, @vitess-bot
+

changelog/21.0/README.md

@@ -1,4 +1,8 @@
 ## v21.0
+* **[21.0.3](21.0.3)**
+	* [Changelog](21.0.3/changelog.md)
+	* [Release Notes](21.0.3/release_notes.md)
+
 * **[21.0.2](21.0.2)**
 	* [Changelog](21.0.2/changelog.md)
 	* [Release Notes](21.0.2/release_notes.md)

examples/operator/operator.yaml

@@ -4422,6 +4422,8 @@ spec:
                         maxItems: 2
                         minItems: 1
                         type: array
+                      sidecarDbName:
+                        type: string
                       turndownPolicy:
                         enum:
                           - RequireIdle
@@ -6239,6 +6241,8 @@ spec:
                   maxItems: 2
                   minItems: 1
                   type: array
+                sidecarDbName:
+                  type: string
                 topologyReconciliation:
                   properties:
                     pruneCells:

go/acl/acl.go

@@ -64,9 +64,6 @@ var (
 // Policy defines the interface that needs to be satisfied by
 // ACL policy implementors.
 type Policy interface {
-	// CheckAccessActor can be called to verify if an actor
-	// has access to the role.
-	CheckAccessActor(actor, role string) error
 	// CheckAccessHTTP can be called to verify if an actor in
 	// the http request has access to the role.
 	CheckAccessHTTP(req *http.Request, role string) error
@@ -101,16 +98,6 @@ func savePolicy() {
 	currentPolicy = denyAllPolicy{}
 }
 
-// CheckAccessActor uses the current security policy to
-// verify if an actor has access to the role.
-func CheckAccessActor(actor, role string) error {
-	once.Do(savePolicy)
-	if currentPolicy != nil {
-		return currentPolicy.CheckAccessActor(actor, role)
-	}
-	return nil
-}
-
 // CheckAccessHTTP uses the current security policy to
 // verify if an actor in an http request has access to
 // the role.

go/acl/acl_test.go

@@ -31,13 +31,6 @@ import (
 
 type TestPolicy struct{}
 
-func (tp TestPolicy) CheckAccessActor(actor, role string) error {
-	if role == ADMIN {
-		return errors.New("not allowed")
-	}
-	return nil
-}
-
 func (tp TestPolicy) CheckAccessHTTP(req *http.Request, role string) error {
 	if role == ADMIN {
 		return errors.New("not allowed")
@@ -55,17 +48,8 @@ func init() {
 
 func TestSimplePolicy(t *testing.T) {
 	currentPolicy = policies["test"]
-	err := CheckAccessActor("", ADMIN)
 	want := "not allowed"
-	assert.Equalf(t, err.Error(), want, "got %v, want %s", err, want)
-
-	err = CheckAccessActor("", DEBUGGING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessActor("", MONITORING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessHTTP(nil, ADMIN)
+	err := CheckAccessHTTP(nil, ADMIN)
 	assert.Equalf(t, err.Error(), want, "got %v, want %s", err, want)
 
 	err = CheckAccessHTTP(nil, DEBUGGING)
@@ -77,16 +61,7 @@ func TestSimplePolicy(t *testing.T) {
 
 func TestEmptyPolicy(t *testing.T) {
 	currentPolicy = nil
-	err := CheckAccessActor("", ADMIN)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessActor("", DEBUGGING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessActor("", MONITORING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessHTTP(nil, ADMIN)
+	err := CheckAccessHTTP(nil, ADMIN)
 	assert.Equalf(t, err, nil, "got %v, want no error", err)
 
 	err = CheckAccessHTTP(nil, DEBUGGING)

go/acl/deny_all_policy.go

@@ -26,11 +26,6 @@ var errDenyAll = errors.New("not allowed: deny-all security_policy enforced")
 // denyAllPolicy rejects all access.
 type denyAllPolicy struct{}
 
-// CheckAccessActor disallows all actor access.
-func (denyAllPolicy) CheckAccessActor(actor, role string) error {
-	return errDenyAll
-}
-
 // CheckAccessHTTP disallows all HTTP access.
 func (denyAllPolicy) CheckAccessHTTP(req *http.Request, role string) error {
 	return errDenyAll