From f921d85f3f374fb1681c7efc1cabdb124ac36b87 Mon Sep 17 00:00:00 2001 From: Priya Bibra Date: Wed, 25 Sep 2024 08:19:21 -0700 Subject: [PATCH 1/5] latest release vitess addons Signed-off-by: Priya Bibra --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 40f2b19e449..583e788617d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module vitess.io/vitess -go 1.22.5 +go 1.22.7 require ( cloud.google.com/go/storage v1.39.0 @@ -102,7 +102,7 @@ require ( github.com/kr/text v0.2.0 github.com/mitchellh/mapstructure v1.5.0 github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 - github.com/slackhq/vitess-addons v0.19.1 + github.com/slackhq/vitess-addons v0.19.2 github.com/slok/noglog v0.2.0 github.com/spf13/afero v1.11.0 github.com/spf13/jwalterweatherman v1.1.0 diff --git a/go.sum b/go.sum index 16bed616cd0..39caf489ec2 100644 --- a/go.sum +++ b/go.sum @@ -450,8 +450,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5ebw= github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U= -github.com/slackhq/vitess-addons v0.19.1 h1:k8f8pAJ2zqtetN+dnehAs7DFcZnI9IQRSL18ZMwNRCw= -github.com/slackhq/vitess-addons v0.19.1/go.mod h1:ZMzBBtadSA1MEuNIfZerztxLMhRFO+tmBZxv5HuV4lE= +github.com/slackhq/vitess-addons v0.19.2 h1:73QSQ2W7n0hzwg61prDi7vByhGp/msVy1RKUEkR2SM0= +github.com/slackhq/vitess-addons v0.19.2/go.mod h1:CP+xpAwBY1IR/+MQzLWyCsCfKMUhfnbHNSvm9KMRlPg= github.com/slok/noglog v0.2.0 h1:1czu4l2EoJ8L92UwdSXXa1Y+c5TIjFAFm2P+mjej95E= github.com/slok/noglog v0.2.0/go.mod h1:TfKxwpEZPT+UA83bQ6RME146k0MM4e8mwHLf6bhcGDI= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= From 0d5e9ba201bb435e65e1d288f66507dac915d5b2 Mon Sep 17 00:00:00 2001 From: Priya Bibra Date: Wed, 25 Sep 2024 08:35:38 -0700 Subject: [PATCH 2/5] version Signed-off-by: Priya Bibra --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 583e788617d..e6b2cb1453a 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/kr/text v0.2.0 github.com/mitchellh/mapstructure v1.5.0 github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 - github.com/slackhq/vitess-addons v0.19.2 + github.com/slackhq/vitess-addons v0.19.1 github.com/slok/noglog v0.2.0 github.com/spf13/afero v1.11.0 github.com/spf13/jwalterweatherman v1.1.0 diff --git a/go.sum b/go.sum index 39caf489ec2..16bed616cd0 100644 --- a/go.sum +++ b/go.sum @@ -450,8 +450,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5ebw= github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U= -github.com/slackhq/vitess-addons v0.19.2 h1:73QSQ2W7n0hzwg61prDi7vByhGp/msVy1RKUEkR2SM0= -github.com/slackhq/vitess-addons v0.19.2/go.mod h1:CP+xpAwBY1IR/+MQzLWyCsCfKMUhfnbHNSvm9KMRlPg= +github.com/slackhq/vitess-addons v0.19.1 h1:k8f8pAJ2zqtetN+dnehAs7DFcZnI9IQRSL18ZMwNRCw= +github.com/slackhq/vitess-addons v0.19.1/go.mod h1:ZMzBBtadSA1MEuNIfZerztxLMhRFO+tmBZxv5HuV4lE= github.com/slok/noglog v0.2.0 h1:1czu4l2EoJ8L92UwdSXXa1Y+c5TIjFAFm2P+mjej95E= github.com/slok/noglog v0.2.0/go.mod h1:TfKxwpEZPT+UA83bQ6RME146k0MM4e8mwHLf6bhcGDI= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= From 36989e4979b8c1dd187bbf3525bb7874d9cd1b2b Mon Sep 17 00:00:00 2001 From: Priya Bibra Date: Wed, 25 Sep 2024 08:37:08 -0700 Subject: [PATCH 3/5] bump again Signed-off-by: Priya Bibra --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e6b2cb1453a..583e788617d 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/kr/text v0.2.0 github.com/mitchellh/mapstructure v1.5.0 github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 - github.com/slackhq/vitess-addons v0.19.1 + github.com/slackhq/vitess-addons v0.19.2 github.com/slok/noglog v0.2.0 github.com/spf13/afero v1.11.0 github.com/spf13/jwalterweatherman v1.1.0 diff --git a/go.sum b/go.sum index 16bed616cd0..39caf489ec2 100644 --- a/go.sum +++ b/go.sum @@ -450,8 +450,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5ebw= github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U= -github.com/slackhq/vitess-addons v0.19.1 h1:k8f8pAJ2zqtetN+dnehAs7DFcZnI9IQRSL18ZMwNRCw= -github.com/slackhq/vitess-addons v0.19.1/go.mod h1:ZMzBBtadSA1MEuNIfZerztxLMhRFO+tmBZxv5HuV4lE= +github.com/slackhq/vitess-addons v0.19.2 h1:73QSQ2W7n0hzwg61prDi7vByhGp/msVy1RKUEkR2SM0= +github.com/slackhq/vitess-addons v0.19.2/go.mod h1:CP+xpAwBY1IR/+MQzLWyCsCfKMUhfnbHNSvm9KMRlPg= github.com/slok/noglog v0.2.0 h1:1czu4l2EoJ8L92UwdSXXa1Y+c5TIjFAFm2P+mjej95E= github.com/slok/noglog v0.2.0/go.mod h1:TfKxwpEZPT+UA83bQ6RME146k0MM4e8mwHLf6bhcGDI= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= From f64b743aa42906d53072b45e75d924c8d2461359 Mon Sep 17 00:00:00 2001 From: Priya Bibra Date: Wed, 25 Sep 2024 08:40:05 -0700 Subject: [PATCH 4/5] go sum Signed-off-by: Priya Bibra --- go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.sum b/go.sum index 39caf489ec2..9096dac7d8e 100644 --- a/go.sum +++ b/go.sum @@ -450,7 +450,7 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5ebw= github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U= -github.com/slackhq/vitess-addons v0.19.2 h1:73QSQ2W7n0hzwg61prDi7vByhGp/msVy1RKUEkR2SM0= +github.com/slackhq/vitess-addons v0.19.2 h1:Gzocb+OPFkjvfWgzGRBDKdjBJjDQ2lH+sCE92YKTsXI= github.com/slackhq/vitess-addons v0.19.2/go.mod h1:CP+xpAwBY1IR/+MQzLWyCsCfKMUhfnbHNSvm9KMRlPg= github.com/slok/noglog v0.2.0 h1:1czu4l2EoJ8L92UwdSXXa1Y+c5TIjFAFm2P+mjej95E= github.com/slok/noglog v0.2.0/go.mod h1:TfKxwpEZPT+UA83bQ6RME146k0MM4e8mwHLf6bhcGDI= From ef7cf71dbd85793d101f64d8859d6eb160ef51cb Mon Sep 17 00:00:00 2001 From: Priya Bibra Date: Wed, 25 Sep 2024 08:59:56 -0700 Subject: [PATCH 5/5] update help txt Signed-off-by: Priya Bibra --- go/flags/endtoend/vtorc.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go/flags/endtoend/vtorc.txt b/go/flags/endtoend/vtorc.txt index b7714068ff7..10019e979a8 100644 --- a/go/flags/endtoend/vtorc.txt +++ b/go/flags/endtoend/vtorc.txt @@ -113,4 +113,6 @@ Flags: --v Level log level for V logs -v, --version print binary version --vmodule vModuleFlag comma-separated list of pattern=N settings for file-filtered logging + --vtops-exec-timeout duration execution timeout for the slack vtops binary (default 15s) + --vtops-max-concurrency int max concurrency for executing the slack vtops binary (default 16) --wait-replicas-timeout duration Duration for which to wait for replica's to respond when issuing RPCs (default 30s)