Merge branch 'slack-19.0' into v19.0.6_slack-19.0

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

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=

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)