From 172a5dd3c60db7766a591737bacba17b2286d9cd Mon Sep 17 00:00:00 2001 From: Maxime Ginters Date: Fri, 25 Oct 2024 10:04:01 -0400 Subject: [PATCH 1/3] Properly close zk.Conn while dereferencing it --- go/vt/topo/zk2topo/zk_conn.go | 13 +++--- go/vt/topo/zk2topo/zk_conn_test.go | 64 ++++++++++++++++++++++++++++++ 2 files changed, 69 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..0912294fd52 --- /dev/null +++ b/go/vt/topo/zk2topo/zk_conn_test.go @@ -0,0 +1,64 @@ +/* +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/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) + _, _, 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 + + // simulate 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("/") + if err == nil { + t.Fatalf("Get() should have failed: %v", err) + } + + if oldConn.State() != zk.StateDisconnected { + t.Fatalf("Connection not closed: %v", oldConn.State()) + } +} From d7d64927f8cf0c53c56b070f92c64c1537d1fc41 Mon Sep 17 00:00:00 2001 From: shanth96 Date: Mon, 28 Oct 2024 19:10:28 -0400 Subject: [PATCH 2/3] feedback --- go/vt/topo/zk2topo/zk_conn_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/go/vt/topo/zk2topo/zk_conn_test.go b/go/vt/topo/zk2topo/zk_conn_test.go index 0912294fd52..de66f7352ce 100644 --- a/go/vt/topo/zk2topo/zk_conn_test.go +++ b/go/vt/topo/zk2topo/zk_conn_test.go @@ -20,6 +20,7 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" "github.com/z-division/go-zookeeper/zk" "vitess.io/vitess/go/testfiles" @@ -31,6 +32,8 @@ func TestZkConnClosedOnDisconnect(t *testing.T) { defer zkd.Teardown() conn := Connect(serverAddr) + defer conn.Close() + _, _, err := conn.Get(context.Background(), "/") if err != nil { t.Fatalf("Get() failed: %v", err) @@ -42,7 +45,7 @@ func TestZkConnClosedOnDisconnect(t *testing.T) { oldConn := conn.conn - // simulate a disconnect + // force a disconnect zkd.Shutdown() zkd.Start() @@ -54,11 +57,9 @@ func TestZkConnClosedOnDisconnect(t *testing.T) { // Check that old connection is closed _, _, err = oldConn.Get("/") - if err == nil { - t.Fatalf("Get() should have failed: %v", err) - } + require.ErrorContains(t, err, "zookeeper is closing") if oldConn.State() != zk.StateDisconnected { - t.Fatalf("Connection not closed: %v", oldConn.State()) + t.Fatalf("Connection is not in disconnected state: %v", oldConn.State()) } } From f472c9ad9e22c102054f856b071534c7c3f1bbb4 Mon Sep 17 00:00:00 2001 From: shanth96 Date: Tue, 29 Oct 2024 17:00:56 -0400 Subject: [PATCH 3/3] Release commit for 18.0.5-shopify-6 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 eee0a697523..b0a160c7b4a 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15000:$WEB_PORT" - "$GRPC_PORT" @@ -81,7 +81,7 @@ services: condition: service_healthy vtgate: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15099:$WEB_PORT" - "$GRPC_PORT" @@ -111,7 +111,7 @@ services: condition: service_healthy schemaload: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 command: - sh - -c @@ -144,12 +144,12 @@ services: environment: - KEYSPACES=$KEYSPACE - GRPC_PORT=15999 - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - .:/script vttablet100: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15100:$WEB_PORT" - "$GRPC_PORT" @@ -181,7 +181,7 @@ services: retries: 15 vttablet101: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15101:$WEB_PORT" - "$GRPC_PORT" @@ -213,7 +213,7 @@ services: retries: 15 vttablet102: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15102:$WEB_PORT" - "$GRPC_PORT" @@ -245,7 +245,7 @@ services: retries: 15 vttablet103: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15103:$WEB_PORT" - "$GRPC_PORT" @@ -277,7 +277,7 @@ services: retries: 15 vtorc: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 command: ["sh", "-c", "/script/vtorc-up.sh"] depends_on: - vtctld @@ -307,7 +307,7 @@ services: retries: 15 vreplication: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - ".:/script" environment: diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index c0322bcff99..f83cecf25cc 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - .:/script set_keyspace_durability_policy: @@ -115,7 +115,7 @@ services: environment: - KEYSPACES=test_keyspace lookup_keyspace - GRPC_PORT=15999 - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - .:/script vtctld: @@ -143,7 +143,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - 15000:8080 - "15999" @@ -160,7 +160,7 @@ services: --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - 15099:8080 - "15999" @@ -182,7 +182,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - 15302:8080 - "15999" diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml index 96d9f80ffbd..c12db16e119 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - .:/script set_keyspace_durability_policy_test_keyspace: @@ -117,7 +117,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=test_keyspace - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - .:/script set_keyspace_durability_policy_unsharded_keyspace: @@ -130,7 +130,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=unsharded_keyspace - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - .:/script vtctld: @@ -159,7 +159,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - 15000:8080 - "15999" @@ -176,7 +176,7 @@ services: ''grpc-vtgateservice'' --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - 15099:8080 - "15999" @@ -199,7 +199,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - 15301:8080 - "15999" diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index ee91d453892..40d677fec2e 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 ports: - "15000:%[1]d" - "%[2]d" @@ -696,7 +696,7 @@ func generateVtgate(opts vtOptions) string { - op: add path: /services/vtgate value: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 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:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - ".:/script" environment: @@ -763,7 +763,7 @@ func generateVreplication(dbInfo externalDbInfo, opts vtOptions) string { - op: add path: /services/vreplication value: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - ".:/script" environment: @@ -791,7 +791,7 @@ func generateSetKeyspaceDurabilityPolicy( - op: add path: /services/set_keyspace_durability_policy_%[3]s value: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - ".:/script" environment: @@ -828,7 +828,7 @@ func generateSchemaload( - op: add path: /services/schemaload_%[7]s value: - image: vitess/lite:v18.0.5-shopify-5 + image: vitess/lite:v18.0.5-shopify-6 volumes: - ".:/script" environment: diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 3dc5a7bfc5f..314ed75855c 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:v18.0.5-shopify-5 - vtadmin: vitess/vtadmin:v18.0.5-shopify-5 - vtgate: vitess/lite:v18.0.5-shopify-5 - vttablet: vitess/lite:v18.0.5-shopify-5 - vtbackup: vitess/lite:v18.0.5-shopify-5 - vtorc: vitess/lite:v18.0.5-shopify-5 + vtctld: vitess/lite:v18.0.5-shopify-6 + vtadmin: vitess/vtadmin:v18.0.5-shopify-6 + vtgate: vitess/lite:v18.0.5-shopify-6 + vttablet: vitess/lite:v18.0.5-shopify-6 + vtbackup: vitess/lite:v18.0.5-shopify-6 + vtorc: vitess/lite:v18.0.5-shopify-6 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-5 + mysql80Compatible: vitess/lite:v18.0.5-shopify-6 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 2eb4b996b93..a7eadb24be7 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:v18.0.5-shopify-5 - vtadmin: vitess/vtadmin:v18.0.5-shopify-5 - vtgate: vitess/lite:v18.0.5-shopify-5 - vttablet: vitess/lite:v18.0.5-shopify-5 - vtbackup: vitess/lite:v18.0.5-shopify-5 - vtorc: vitess/lite:v18.0.5-shopify-5 + vtctld: vitess/lite:v18.0.5-shopify-6 + vtadmin: vitess/vtadmin:v18.0.5-shopify-6 + vtgate: vitess/lite:v18.0.5-shopify-6 + vttablet: vitess/lite:v18.0.5-shopify-6 + vtbackup: vitess/lite:v18.0.5-shopify-6 + vtorc: vitess/lite:v18.0.5-shopify-6 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-5 + mysql80Compatible: vitess/lite:v18.0.5-shopify-6 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 cd5a3b9d267..8dd9aeeb6c3 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:v18.0.5-shopify-5 - vtadmin: vitess/vtadmin:v18.0.5-shopify-5 - vtgate: vitess/lite:v18.0.5-shopify-5 - vttablet: vitess/lite:v18.0.5-shopify-5 - vtbackup: vitess/lite:v18.0.5-shopify-5 - vtorc: vitess/lite:v18.0.5-shopify-5 + vtctld: vitess/lite:v18.0.5-shopify-6 + vtadmin: vitess/vtadmin:v18.0.5-shopify-6 + vtgate: vitess/lite:v18.0.5-shopify-6 + vttablet: vitess/lite:v18.0.5-shopify-6 + vtbackup: vitess/lite:v18.0.5-shopify-6 + vtorc: vitess/lite:v18.0.5-shopify-6 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-5 + mysql80Compatible: vitess/lite:v18.0.5-shopify-6 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 78c7a3e7355..0ace66f8def 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:v18.0.5-shopify-5 - vtadmin: vitess/vtadmin:v18.0.5-shopify-5 - vtgate: vitess/lite:v18.0.5-shopify-5 - vttablet: vitess/lite:v18.0.5-shopify-5 - vtbackup: vitess/lite:v18.0.5-shopify-5 - vtorc: vitess/lite:v18.0.5-shopify-5 + vtctld: vitess/lite:v18.0.5-shopify-6 + vtadmin: vitess/vtadmin:v18.0.5-shopify-6 + vtgate: vitess/lite:v18.0.5-shopify-6 + vttablet: vitess/lite:v18.0.5-shopify-6 + vtbackup: vitess/lite:v18.0.5-shopify-6 + vtorc: vitess/lite:v18.0.5-shopify-6 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-5 + mysql80Compatible: vitess/lite:v18.0.5-shopify-6 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 3b014b11e12..9855ef7ee6c 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 = "18.0.5-shopify-5" +const versionName = "18.0.5-shopify-6" diff --git a/java/client/pom.xml b/java/client/pom.xml index 2c45899c402..f27c9ce008d 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-5 + 18.0.5-shopify-6 vitess-client diff --git a/java/example/pom.xml b/java/example/pom.xml index ff667820ec1..5db40d8b1ec 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-5 + 18.0.5-shopify-6 vitess-example diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml index f2920306acf..3b5d129007d 100644 --- a/java/grpc-client/pom.xml +++ b/java/grpc-client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-5 + 18.0.5-shopify-6 vitess-grpc-client diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml index 9630a1c69ba..6e6db70ce51 100644 --- a/java/jdbc/pom.xml +++ b/java/jdbc/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-5 + 18.0.5-shopify-6 vitess-jdbc diff --git a/java/pom.xml b/java/pom.xml index dec9e516f67..d3e387df32f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ io.vitess vitess-parent - 18.0.5-shopify-5 + 18.0.5-shopify-6 pom Vitess Java Client libraries [Parent]