From d2ddcddd26828c2f123676305c52936e75055221 Mon Sep 17 00:00:00 2001 From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2024 12:49:23 -0400 Subject: [PATCH 1/3] [release-19.0] VTTablet: smartconnpool: notify all expired waiters (#16897) (#16901) Signed-off-by: Brendan Dougherty Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com> --- go/pools/smartconnpool/waitlist.go | 5 +- go/pools/smartconnpool/waitlist_test.go | 68 +++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 go/pools/smartconnpool/waitlist_test.go diff --git a/go/pools/smartconnpool/waitlist.go b/go/pools/smartconnpool/waitlist.go index d4abeade0ac..f16215f4b14 100644 --- a/go/pools/smartconnpool/waitlist.go +++ b/go/pools/smartconnpool/waitlist.go @@ -88,11 +88,14 @@ func (wl *waitlist[C]) expire(force bool) { // or remove everything if force is true for e := wl.list.Front(); e != nil; e = e.Next() { if force || e.Value.ctx.Err() != nil { - wl.list.Remove(e) expired = append(expired, e) continue } } + // remove the expired waiters from the waitlist after traversing it + for _, e := range expired { + wl.list.Remove(e) + } wl.mu.Unlock() // once all the expired waiters have been removed from the waitlist, wake them up one by one diff --git a/go/pools/smartconnpool/waitlist_test.go b/go/pools/smartconnpool/waitlist_test.go new file mode 100644 index 00000000000..1486aa989b6 --- /dev/null +++ b/go/pools/smartconnpool/waitlist_test.go @@ -0,0 +1,68 @@ +/* +Copyright 2024 The Vitess Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package smartconnpool + +import ( + "context" + "sync/atomic" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestWaitlistExpireWithMultipleWaiters(t *testing.T) { + wait := waitlist[*TestConn]{} + wait.init() + + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond) + defer cancel() + + waiterCount := 2 + expireCount := atomic.Int32{} + + for i := 0; i < waiterCount; i++ { + go func() { + _, err := wait.waitForConn(ctx, nil) + if err != nil { + expireCount.Add(1) + } + }() + } + + // Wait for the context to expire + <-ctx.Done() + + // Expire the waiters + wait.expire(false) + + // Wait for the notified goroutines to finish + timeout := time.After(1 * time.Second) + ticker := time.NewTicker(10 * time.Millisecond) + defer ticker.Stop() + for expireCount.Load() != int32(waiterCount) { + select { + case <-timeout: + require.Failf(t, "Timed out waiting for all waiters to expire", "Wanted %d, got %d", waiterCount, expireCount.Load()) + case <-ticker.C: + // try again + } + } + + assert.Equal(t, int32(waiterCount), expireCount.Load()) +} From 3e8fc9c43ab3ba3aad71883b41c8fb80c1bf7e91 Mon Sep 17 00:00:00 2001 From: shanth96 Date: Tue, 29 Oct 2024 17:34:16 -0400 Subject: [PATCH 2/3] Merge pull request #192 from Shopify/zk-conn-fix Fix zookeeper connection leak --- go/vt/topo/zk2topo/zk_conn.go | 13 +++--- go/vt/topo/zk2topo/zk_conn_test.go | 65 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 go/vt/topo/zk2topo/zk_conn_test.go diff --git a/go/vt/topo/zk2topo/zk_conn.go b/go/vt/topo/zk2topo/zk_conn.go index a0eec8b4340..60ba00a2bf6 100644 --- a/go/vt/topo/zk2topo/zk_conn.go +++ b/go/vt/topo/zk2topo/zk_conn.go @@ -277,6 +277,8 @@ func (c *ZkConn) withRetry(ctx context.Context, action func(conn *zk.Conn) error c.conn = nil } c.mu.Unlock() + log.Infof("zk conn: got ErrConnectionClosed: closing") + conn.Close() } return } @@ -327,13 +329,9 @@ func (c *ZkConn) maybeAddAuth(ctx context.Context) { // clears out the connection record. func (c *ZkConn) handleSessionEvents(conn *zk.Conn, session <-chan zk.Event) { for event := range session { - closeRequired := false switch event.State { - case zk.StateExpired, zk.StateConnecting: - closeRequired = true - fallthrough - case zk.StateDisconnected: + case zk.StateDisconnected, zk.StateExpired, zk.StateConnecting: c.mu.Lock() if c.conn == conn { // The ZkConn still references this @@ -341,9 +339,8 @@ func (c *ZkConn) handleSessionEvents(conn *zk.Conn, session <-chan zk.Event) { c.conn = nil } c.mu.Unlock() - if closeRequired { - conn.Close() - } + log.Infof("zk conn: got %v: closing", event.State) + conn.Close() log.Infof("zk conn: session for addr %v ended: %v", c.addr, event) return } diff --git a/go/vt/topo/zk2topo/zk_conn_test.go b/go/vt/topo/zk2topo/zk_conn_test.go new file mode 100644 index 00000000000..de66f7352ce --- /dev/null +++ b/go/vt/topo/zk2topo/zk_conn_test.go @@ -0,0 +1,65 @@ +/* +Copyright 2019 The Vitess Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package zk2topo + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "github.com/z-division/go-zookeeper/zk" + + "vitess.io/vitess/go/testfiles" + "vitess.io/vitess/go/vt/zkctl" +) + +func TestZkConnClosedOnDisconnect(t *testing.T) { + zkd, serverAddr := zkctl.StartLocalZk(testfiles.GoVtTopoZk2topoZkID, testfiles.GoVtTopoZk2topoPort) + defer zkd.Teardown() + + conn := Connect(serverAddr) + defer conn.Close() + + _, _, err := conn.Get(context.Background(), "/") + if err != nil { + t.Fatalf("Get() failed: %v", err) + } + + if !conn.conn.State().IsConnected() { + t.Fatalf("Connection not connected: %v", conn.conn.State()) + } + + oldConn := conn.conn + + // force a disconnect + zkd.Shutdown() + zkd.Start() + + // do another get to trigger a new connection + _, _, err = conn.Get(context.Background(), "/") + if err != nil { + t.Fatalf("Get() failed: %v", err) + } + + // Check that old connection is closed + _, _, err = oldConn.Get("/") + require.ErrorContains(t, err, "zookeeper is closing") + + if oldConn.State() != zk.StateDisconnected { + t.Fatalf("Connection is not in disconnected state: %v", oldConn.State()) + } +} From 5e0a89e32a94e834371c594c7870cd0d36b08134 Mon Sep 17 00:00:00 2001 From: shanth96 Date: Tue, 5 Nov 2024 11:17:24 -0500 Subject: [PATCH 3/3] Release commit for 19.0.5-shopify-3 Signed-off-by: shanth96 --- examples/compose/docker-compose.beginners.yml | 20 +++++++------- examples/compose/docker-compose.yml | 26 +++++++++---------- .../compose/vtcompose/docker-compose.test.yml | 26 +++++++++---------- examples/compose/vtcompose/vtcompose.go | 18 ++++++------- examples/operator/101_initial_cluster.yaml | 14 +++++----- examples/operator/201_customer_tablets.yaml | 14 +++++----- examples/operator/302_new_shards.yaml | 14 +++++----- examples/operator/306_down_shard_0.yaml | 14 +++++----- go/vt/servenv/version.go | 2 +- java/client/pom.xml | 2 +- java/example/pom.xml | 2 +- java/grpc-client/pom.xml | 2 +- java/jdbc/pom.xml | 2 +- java/pom.xml | 2 +- 14 files changed, 79 insertions(+), 79 deletions(-) diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml index 66fdb98cad2..69a85f4d025 100644 --- a/examples/compose/docker-compose.beginners.yml +++ b/examples/compose/docker-compose.beginners.yml @@ -58,7 +58,7 @@ services: - "3306" vtctld: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15000:$WEB_PORT" - "$GRPC_PORT" @@ -81,7 +81,7 @@ services: condition: service_healthy vtgate: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15099:$WEB_PORT" - "$GRPC_PORT" @@ -111,7 +111,7 @@ services: condition: service_healthy schemaload: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 command: - sh - -c @@ -144,12 +144,12 @@ services: environment: - KEYSPACES=$KEYSPACE - GRPC_PORT=15999 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script vttablet100: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15100:$WEB_PORT" - "$GRPC_PORT" @@ -181,7 +181,7 @@ services: retries: 15 vttablet101: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15101:$WEB_PORT" - "$GRPC_PORT" @@ -213,7 +213,7 @@ services: retries: 15 vttablet102: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15102:$WEB_PORT" - "$GRPC_PORT" @@ -245,7 +245,7 @@ services: retries: 15 vttablet103: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15103:$WEB_PORT" - "$GRPC_PORT" @@ -277,7 +277,7 @@ services: retries: 15 vtorc: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 command: ["sh", "-c", "/script/vtorc-up.sh"] depends_on: - vtctld @@ -307,7 +307,7 @@ services: retries: 15 vreplication: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - ".:/script" environment: diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index 2ffb667cc92..75b3083460b 100644 --- a/examples/compose/docker-compose.yml +++ b/examples/compose/docker-compose.yml @@ -75,7 +75,7 @@ services: - SCHEMA_FILES=lookup_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script schemaload_test_keyspace: @@ -101,7 +101,7 @@ services: - SCHEMA_FILES=test_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script set_keyspace_durability_policy: @@ -115,7 +115,7 @@ services: environment: - KEYSPACES=test_keyspace lookup_keyspace - GRPC_PORT=15999 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script vreplication: @@ -129,7 +129,7 @@ services: - TOPOLOGY_FLAGS=--topo_implementation consul --topo_global_server_address consul1:8500 --topo_global_root vitess/global - EXTERNAL_DB=0 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script vtctld: @@ -143,7 +143,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15000:8080 - "15999" @@ -160,7 +160,7 @@ services: --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15099:8080 - "15999" @@ -182,7 +182,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 13000:8080 volumes: @@ -217,7 +217,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15101:8080 - "15999" @@ -254,7 +254,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15102:8080 - "15999" @@ -291,7 +291,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15201:8080 - "15999" @@ -328,7 +328,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15202:8080 - "15999" @@ -365,7 +365,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15301:8080 - "15999" @@ -402,7 +402,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15302:8080 - "15999" diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml index 5a8ed090980..e35e44e10cb 100644 --- a/examples/compose/vtcompose/docker-compose.test.yml +++ b/examples/compose/vtcompose/docker-compose.test.yml @@ -79,7 +79,7 @@ services: - SCHEMA_FILES=test_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script schemaload_unsharded_keyspace: @@ -103,7 +103,7 @@ services: - SCHEMA_FILES=unsharded_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script set_keyspace_durability_policy_test_keyspace: @@ -117,7 +117,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=test_keyspace - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script set_keyspace_durability_policy_unsharded_keyspace: @@ -130,7 +130,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=unsharded_keyspace - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script vreplication: @@ -144,7 +144,7 @@ services: - TOPOLOGY_FLAGS=--topo_implementation consul --topo_global_server_address consul1:8500 --topo_global_root vitess/global - EXTERNAL_DB=0 - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - .:/script vtctld: @@ -159,7 +159,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15000:8080 - "15999" @@ -176,7 +176,7 @@ services: ''grpc-vtgateservice'' --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15099:8080 - "15999" @@ -199,7 +199,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 13000:8080 volumes: @@ -234,7 +234,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15101:8080 - "15999" @@ -271,7 +271,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15102:8080 - "15999" @@ -308,7 +308,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15201:8080 - "15999" @@ -345,7 +345,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15202:8080 - "15999" @@ -382,7 +382,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - 15301:8080 - "15999" diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index 21ef9ef70ad..7f00ebf27e3 100644 --- a/examples/compose/vtcompose/vtcompose.go +++ b/examples/compose/vtcompose/vtcompose.go @@ -533,7 +533,7 @@ func generateDefaultShard(tabAlias int, shard string, keyspaceData keyspaceInfo, - op: add path: /services/init_shard_primary%[2]d value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 command: ["sh", "-c", "/vt/bin/vtctldclient %[5]s InitShardPrimary --force %[4]s/%[3]s %[6]s-%[2]d "] %[1]s `, dependsOn, aliases[0], shard, keyspaceData.keyspace, opts.topologyFlags, opts.cell) @@ -565,7 +565,7 @@ func generateExternalPrimary( - op: add path: /services/vttablet%[1]d value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15%[1]d:%[3]d" - "%[4]d" @@ -627,7 +627,7 @@ func generateDefaultTablet(tabAlias int, shard, role, keyspace string, dbInfo ex - op: add path: /services/vttablet%[1]d value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15%[1]d:%[4]d" - "%[5]d" @@ -665,7 +665,7 @@ func generateVtctld(opts vtOptions) string { - op: add path: /services/vtctld value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15000:%[1]d" - "%[2]d" @@ -696,7 +696,7 @@ func generateVtgate(opts vtOptions) string { - op: add path: /services/vtgate value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 ports: - "15099:%[1]d" - "%[2]d" @@ -738,7 +738,7 @@ func generateVTOrc(dbInfo externalDbInfo, keyspaceInfoMap map[string]keyspaceInf - op: add path: /services/vtorc value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - ".:/script" environment: @@ -763,7 +763,7 @@ func generateVreplication(dbInfo externalDbInfo, opts vtOptions) string { - op: add path: /services/vreplication value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - ".:/script" environment: @@ -791,7 +791,7 @@ func generateSetKeyspaceDurabilityPolicy( - op: add path: /services/set_keyspace_durability_policy_%[3]s value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - ".:/script" environment: @@ -828,7 +828,7 @@ func generateSchemaload( - op: add path: /services/schemaload_%[7]s value: - image: vitess/lite:v19.0.5-shopify-2 + image: vitess/lite:v19.0.5-shopify-3 volumes: - ".:/script" environment: diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 72967061889..eba3bf71fc3 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v19.0.5-shopify-2 - vtadmin: vitess/vtadmin:v19.0.5-shopify-2 - vtgate: vitess/lite:v19.0.5-shopify-2 - vttablet: vitess/lite:v19.0.5-shopify-2 - vtbackup: vitess/lite:v19.0.5-shopify-2 - vtorc: vitess/lite:v19.0.5-shopify-2 + vtctld: vitess/lite:v19.0.5-shopify-3 + vtadmin: vitess/vtadmin:v19.0.5-shopify-3 + vtgate: vitess/lite:v19.0.5-shopify-3 + vttablet: vitess/lite:v19.0.5-shopify-3 + vtbackup: vitess/lite:v19.0.5-shopify-3 + vtorc: vitess/lite:v19.0.5-shopify-3 mysqld: - mysql80Compatible: vitess/lite:v19.0.5-shopify-2 + mysql80Compatible: vitess/lite:v19.0.5-shopify-3 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index 0fa7290a63c..70fac3a396a 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v19.0.5-shopify-2 - vtadmin: vitess/vtadmin:v19.0.5-shopify-2 - vtgate: vitess/lite:v19.0.5-shopify-2 - vttablet: vitess/lite:v19.0.5-shopify-2 - vtbackup: vitess/lite:v19.0.5-shopify-2 - vtorc: vitess/lite:v19.0.5-shopify-2 + vtctld: vitess/lite:v19.0.5-shopify-3 + vtadmin: vitess/vtadmin:v19.0.5-shopify-3 + vtgate: vitess/lite:v19.0.5-shopify-3 + vttablet: vitess/lite:v19.0.5-shopify-3 + vtbackup: vitess/lite:v19.0.5-shopify-3 + vtorc: vitess/lite:v19.0.5-shopify-3 mysqld: - mysql80Compatible: vitess/lite:v19.0.5-shopify-2 + mysql80Compatible: vitess/lite:v19.0.5-shopify-3 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index db59e9fab7e..fa6a0bdbe2a 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v19.0.5-shopify-2 - vtadmin: vitess/vtadmin:v19.0.5-shopify-2 - vtgate: vitess/lite:v19.0.5-shopify-2 - vttablet: vitess/lite:v19.0.5-shopify-2 - vtbackup: vitess/lite:v19.0.5-shopify-2 - vtorc: vitess/lite:v19.0.5-shopify-2 + vtctld: vitess/lite:v19.0.5-shopify-3 + vtadmin: vitess/vtadmin:v19.0.5-shopify-3 + vtgate: vitess/lite:v19.0.5-shopify-3 + vttablet: vitess/lite:v19.0.5-shopify-3 + vtbackup: vitess/lite:v19.0.5-shopify-3 + vtorc: vitess/lite:v19.0.5-shopify-3 mysqld: - mysql80Compatible: vitess/lite:v19.0.5-shopify-2 + mysql80Compatible: vitess/lite:v19.0.5-shopify-3 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index 12610eb03ac..6c6dbfe397e 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v19.0.5-shopify-2 - vtadmin: vitess/vtadmin:v19.0.5-shopify-2 - vtgate: vitess/lite:v19.0.5-shopify-2 - vttablet: vitess/lite:v19.0.5-shopify-2 - vtbackup: vitess/lite:v19.0.5-shopify-2 - vtorc: vitess/lite:v19.0.5-shopify-2 + vtctld: vitess/lite:v19.0.5-shopify-3 + vtadmin: vitess/vtadmin:v19.0.5-shopify-3 + vtgate: vitess/lite:v19.0.5-shopify-3 + vttablet: vitess/lite:v19.0.5-shopify-3 + vtbackup: vitess/lite:v19.0.5-shopify-3 + vtorc: vitess/lite:v19.0.5-shopify-3 mysqld: - mysql80Compatible: vitess/lite:v19.0.5-shopify-2 + mysql80Compatible: vitess/lite:v19.0.5-shopify-3 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/go/vt/servenv/version.go b/go/vt/servenv/version.go index e97ccf0e418..30ca330fea4 100644 --- a/go/vt/servenv/version.go +++ b/go/vt/servenv/version.go @@ -19,4 +19,4 @@ package servenv // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY ./tools/do_releases.sh // DO NOT EDIT -const versionName = "19.0.5-shopify-2" +const versionName = "19.0.5-shopify-3" diff --git a/java/client/pom.xml b/java/client/pom.xml index 7a66cb6fd55..4f89680365e 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 19.0.5-shopify-2 + 19.0.5-shopify-3 vitess-client diff --git a/java/example/pom.xml b/java/example/pom.xml index cb8e8446ac7..dd9f660fcd6 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 19.0.5-shopify-2 + 19.0.5-shopify-3 vitess-example diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml index d980a5746d0..478abb35b41 100644 --- a/java/grpc-client/pom.xml +++ b/java/grpc-client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 19.0.5-shopify-2 + 19.0.5-shopify-3 vitess-grpc-client diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml index 0a91053c016..8206e0fbf87 100644 --- a/java/jdbc/pom.xml +++ b/java/jdbc/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 19.0.5-shopify-2 + 19.0.5-shopify-3 vitess-jdbc diff --git a/java/pom.xml b/java/pom.xml index cbe0fa1ce2a..81a206a0b00 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ io.vitess vitess-parent - 19.0.5-shopify-2 + 19.0.5-shopify-3 pom Vitess Java Client libraries [Parent]