From 80b472c96e515bd75cb2554dd8dd65ef0b476964 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 26 Sep 2024 21:08:34 +0200 Subject: [PATCH] `slack-19.0`: use `slackhq/vitess-addons` release `v0.19.2` (#522) * `slack-19.0`: use `slackhq/vitess-addons` release `v19.0.2` Signed-off-by: Tim Vaillancourt * update `vtorc` flags e2e test Signed-off-by: Tim Vaillancourt * go1.22.7 Signed-off-by: Tim Vaillancourt * Revert "go1.22.7" This reverts commit 1a30617dee66b6e6245e24045030d5c9aa56bf04. * go mod tidy again Signed-off-by: Tim Vaillancourt --------- Signed-off-by: Tim Vaillancourt --- build.env | 2 +- go.mod | 2 +- go.sum | 4 ++-- go/flags/endtoend/vtorc.txt | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.env b/build.env index da683559425..9f87f437391 100755 --- a/build.env +++ b/build.env @@ -49,7 +49,7 @@ git config core.hooksPath .git/hooks export EXTRA_BIN=$PWD/test/bin # support private github.com/slackhq/vitess-addons repo +export GOPRIVATE=github.com/slackhq/vitess-addons if [[ -n "${GH_ACCESS_TOKEN}" ]]; then - export GOPRIVATE=github.com/slackhq/vitess-addons git config --global url.https://${GH_ACCESS_TOKEN}@github.com/.insteadOf https://github.com/ fi diff --git a/go.mod b/go.mod index 40f2b19e449..a20b720cd49 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..105488a6c20 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:ZNO7a9yulqU3ZBWYKcvwFbS/CtHpB3ckOIFw1U2Vw3Y= +github.com/slackhq/vitess-addons v0.19.2/go.mod h1:4/vOK9XgBM0Feij9q48UT7D+n2R4E9HZp0V0aZy7Q5M= 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= 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)