From 3a1c927af9db19c8657278e9a728e2bca3396a93 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 12 Jun 2023 15:32:07 -0400 Subject: [PATCH 1/4] Deprecate VTGR Signed-off-by: Matt Lord --- changelog/17.0/17.0.0/release_notes.md | 5 +++++ go/cmd/vtgr/main.go | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changelog/17.0/17.0.0/release_notes.md b/changelog/17.0/17.0.0/release_notes.md index f289ccfb0d4..e58a8313f07 100644 --- a/changelog/17.0/17.0.0/release_notes.md +++ b/changelog/17.0/17.0.0/release_notes.md @@ -35,6 +35,7 @@ - **[Deprecations and Deletions](#deprecations-and-deletions)** - [Deprecated Flags](#deprecated-flags) - [Deprecated Stats](#deprecated-stats) + - [`vtgr` Deprecated](#deprecated-vtgr) ## Major Changes @@ -451,6 +452,10 @@ These stats are deprecated in v17. | `backup_duration_seconds` | `BackupDurationNanoseconds` | | `restore_duration_seconds` | `RestoreDurationNanoseconds` | +### Deprecated `vtgr` + +The `vtgr` component has been deprecated, also see https://github.com/vitessio/vitess/issues/13300. In Vitess 18 `vtgr` will be removed. + ------------ The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/17.0/17.0.0/changelog.md). diff --git a/go/cmd/vtgr/main.go b/go/cmd/vtgr/main.go index 23e932e8f5d..bc403f2aa67 100644 --- a/go/cmd/vtgr/main.go +++ b/go/cmd/vtgr/main.go @@ -15,15 +15,21 @@ package main import ( "context" + "fmt" "github.com/spf13/pflag" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vtgr" ) +const deprecationMsg = "vtgr is deprecated and will be removed in Vitess 18. We recommend using VTOrc with semi-sync replication instead." + func main() { + fmt.Println(deprecationMsg) + var clustersToWatch []string servenv.OnParseFor("vtgr", func(fs *pflag.FlagSet) { fs.StringSliceVar(&clustersToWatch, "clusters_to_watch", nil, `Comma-separated list of keyspaces or keyspace/shards that this instance will monitor and repair. Defaults to all clusters in the topology. Example: "ks1,ks2/-80"`) @@ -32,6 +38,8 @@ func main() { }) servenv.ParseFlags("vtgr") + log.Warning(deprecationMsg) + // openTabletDiscovery will open up a connection to topo server // and populate the tablets in memory vtgr := vtgr.OpenTabletDiscovery(context.Background(), nil, clustersToWatch) From cd9509bb8ac2e309b9ee9b48e9fdbfb5916a71f0 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 12 Jun 2023 15:47:08 -0400 Subject: [PATCH 2/4] Update help output in test Signed-off-by: Matt Lord --- go/flags/endtoend/vtgr.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/go/flags/endtoend/vtgr.txt b/go/flags/endtoend/vtgr.txt index cbee799bf3e..4eaccf56b1f 100644 --- a/go/flags/endtoend/vtgr.txt +++ b/go/flags/endtoend/vtgr.txt @@ -1,3 +1,4 @@ +vtgr is deprecated and will be removed in Vitess 18. We recommend using VTOrc with semi-sync replication instead. Usage of vtgr: --abort_rebootstrap Don't allow vtgr to rebootstrap an existing group. --alsologtostderr log to standard error as well as files From 79a2f8ddec70768e660461b9b20ec86f063ed46c Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 12 Jun 2023 15:53:33 -0400 Subject: [PATCH 3/4] Add vtgr deprecation to summary as well Signed-off-by: Matt Lord --- changelog/17.0/17.0.0/summary.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/changelog/17.0/17.0.0/summary.md b/changelog/17.0/17.0.0/summary.md index e3d362bb468..fdb1763a412 100644 --- a/changelog/17.0/17.0.0/summary.md +++ b/changelog/17.0/17.0.0/summary.md @@ -34,6 +34,7 @@ - **[Deprecations and Deletions](#deprecations-and-deletions)** - [Deprecated Flags](#deprecated-flags) - [Deprecated Stats](#deprecated-stats) + - [Deprecated `vtgr`](#deprecated-vtgr) - [Deprecated `k8stopo`](#deprecated-k8stopo) @@ -451,6 +452,10 @@ These stats are deprecated in v17. | `backup_duration_seconds` | `BackupDurationNanoseconds` | | `restore_duration_seconds` | `RestoreDurationNanoseconds` | +### Deprecated `vtgr` + +The `vtgr` component has been deprecated, also see https://github.com/vitessio/vitess/issues/13300. In Vitess 18 `vtgr` will be removed. + #### Deprecated `k8stopo` -The `k8stopo` has been deprecated, also see https://github.com/vitessio/vitess/issues/13298. With Vitess 18 the `k8stopo` will be removed. \ No newline at end of file +The `k8stopo` has been deprecated, also see https://github.com/vitessio/vitess/issues/13298. With Vitess 18 the `k8stopo` will be removed. From 08b1de4b93080e21f1d23d5b750746c4de3560bb Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 12 Jun 2023 16:01:33 -0400 Subject: [PATCH 4/4] Align text across files Signed-off-by: Matt Lord --- changelog/17.0/17.0.0/release_notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog/17.0/17.0.0/release_notes.md b/changelog/17.0/17.0.0/release_notes.md index 87721fd2c5b..b649ffd4120 100644 --- a/changelog/17.0/17.0.0/release_notes.md +++ b/changelog/17.0/17.0.0/release_notes.md @@ -35,8 +35,8 @@ - **[Deprecations and Deletions](#deprecations-and-deletions)** - [Deprecated Flags](#deprecated-flags) - [Deprecated Stats](#deprecated-stats) - - [`vtgr` Deprecated](#deprecated-vtgr) - - [`k8stopo` Deprecated](#deprecated-k8stopo) + - [Deprecated `vtgr`](#deprecated-vtgr) + - [Deprecated `k8stopo`](#deprecated-k8stopo) ## Major Changes