From 23ba50344fe046c41b2c88b20f6884a6b476f424 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Tue, 17 Dec 2024 16:48:26 +0100 Subject: [PATCH 01/14] `slack-19.0`: use `slackhq/vitess-addons@v0.19.5` Signed-off-by: Tim Vaillancourt --- go.mod | 2 +- go.sum | 4 ++-- go/vt/vtorc/logic/topology_recovery.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index ca82576cfaf..aafaafe38d3 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,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.4 + github.com/slackhq/vitess-addons v0.19.5 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 2dcec89ecc8..6b73a7865f7 100644 --- a/go.sum +++ b/go.sum @@ -448,8 +448,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.4 h1:9BicIa9BK6ynqrJYCdE2fdFjN0LsfPS8DiYyYTO6vVQ= -github.com/slackhq/vitess-addons v0.19.4/go.mod h1:2icrtf8lZyzdEH1r7PoXy8g66D4LG/bIhA9rQUqR+BQ= +github.com/slackhq/vitess-addons v0.19.5 h1:ZrLHvZuMyZWlW9XY6+AEm4BeVC8/R8iNTOtQkKHbSwM= +github.com/slackhq/vitess-addons v0.19.5/go.mod h1:2icrtf8lZyzdEH1r7PoXy8g66D4LG/bIhA9rQUqR+BQ= 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/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index 91a8d81cfbb..eed1fd3f9fb 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -86,7 +86,7 @@ var ( // vtops vtopsService = fmt.Sprintf("%s-%s-%s", os.Getenv("BEDROCK_CONTAINER_NAME"), os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) - vtopsExec = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), vtopsService, os.Getenv("HOSTNAME")) + vtopsExec = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), vtopsService) vtopsSlackChannel = os.Getenv("SLACK_CHANNEL") ) From c4e6b0afe0877d6379bb01f90f6b2fe995fb909d Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Tue, 17 Dec 2024 16:52:03 +0100 Subject: [PATCH 02/14] simplify vtorc service name Signed-off-by: Tim Vaillancourt --- go/vt/vtorc/logic/topology_recovery.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index eed1fd3f9fb..c0a30ffb829 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -85,7 +85,7 @@ var ( recoveriesFailureCounter = stats.NewCountersWithSingleLabel("FailedRecoveries", "Count of the different failed recoveries performed", "RecoveryType", actionableRecoveriesNames...) // vtops - vtopsService = fmt.Sprintf("%s-%s-%s", os.Getenv("BEDROCK_CONTAINER_NAME"), os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) + vtopsService = fmt.Sprintf("%s-%s", os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) vtopsExec = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), vtopsService) vtopsSlackChannel = os.Getenv("SLACK_CHANNEL") ) From 6f950a3eb4ae5c08be46be592bd455bd1321c9b2 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Tue, 17 Dec 2024 16:52:40 +0100 Subject: [PATCH 03/14] simplify vtorc service name 2 Signed-off-by: Tim Vaillancourt --- go/vt/vtorc/logic/topology_recovery.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index c0a30ffb829..25cb732d99e 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -85,7 +85,7 @@ var ( recoveriesFailureCounter = stats.NewCountersWithSingleLabel("FailedRecoveries", "Count of the different failed recoveries performed", "RecoveryType", actionableRecoveriesNames...) // vtops - vtopsService = fmt.Sprintf("%s-%s", os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) + vtopsService = fmt.Sprintf("vtorc-%s-%s", os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) vtopsExec = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), vtopsService) vtopsSlackChannel = os.Getenv("SLACK_CHANNEL") ) From 42e57a7680320caec1c6bd432d3b36b5bb48d221 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 18 Dec 2024 17:43:36 +0100 Subject: [PATCH 04/14] add temp conditional for vtops-vtorc Signed-off-by: Tim Vaillancourt --- go/vt/vtorc/logic/topology_recovery.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index 25cb732d99e..0c8c93bb3fa 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -22,6 +22,7 @@ import ( "fmt" "math/rand" "os" + "strings" "time" "github.com/patrickmn/go-cache" @@ -85,8 +86,9 @@ var ( recoveriesFailureCounter = stats.NewCountersWithSingleLabel("FailedRecoveries", "Count of the different failed recoveries performed", "RecoveryType", actionableRecoveriesNames...) // vtops + vtopsPath = os.Getenv("VTOPS_PATH") vtopsService = fmt.Sprintf("vtorc-%s-%s", os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) - vtopsExec = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), vtopsService) + vtopsExec = external.NewExecVTOps(vtopsPath, vtopsService) vtopsSlackChannel = os.Getenv("SLACK_CHANNEL") ) @@ -304,7 +306,13 @@ func postErsCompletion(topologyRecovery *TopologyRecovery, analysisEntry *inst.R _ = AuditTopologyRecovery(topologyRecovery, message) _ = inst.AuditOperation(recoveryName, analysisEntry.AnalyzedInstanceAlias, message) _ = AuditTopologyRecovery(topologyRecovery, fmt.Sprintf("%v: successfully promoted %+v", recoveryName, promotedReplica.InstanceAlias)) - vtopsExec.RaiseProblem(analysisEntry.AnalyzedInstanceHostname, "orc-dead-tablet") + + // TODO: remove this conditional and 'else' side after vtops-vtorc is used 100%. + if strings.HasSuffix(vtopsPath, "vtops-vtorc") { + vtopsExec.RaiseProblem(analysisEntry.AnalyzedInstanceAlias, "orc-dead-tablet") + } else { + vtopsExec.RaiseProblem(analysisEntry.AnalyzedInstanceHostname, "orc-dead-tablet") + } } } From 5bc7174629e85cadb96c9c6f5d370de304d0a594 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 18 Dec 2024 20:41:50 +0100 Subject: [PATCH 05/14] pre-test v0.19.6 tag w/commit Signed-off-by: Tim Vaillancourt --- go.mod | 2 +- go.sum | 4 ++++ go/vt/vtorc/logic/topology_recovery.go | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index aafaafe38d3..e3edb7fba9a 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,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.5 + github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a 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 6b73a7865f7..619e6a1bce7 100644 --- a/go.sum +++ b/go.sum @@ -450,6 +450,10 @@ github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5eb github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U= github.com/slackhq/vitess-addons v0.19.5 h1:ZrLHvZuMyZWlW9XY6+AEm4BeVC8/R8iNTOtQkKHbSwM= github.com/slackhq/vitess-addons v0.19.5/go.mod h1:2icrtf8lZyzdEH1r7PoXy8g66D4LG/bIhA9rQUqR+BQ= +github.com/slackhq/vitess-addons v0.19.6-0.20241218190308-908d505e2828 h1:vgjhnLePfSyFf2oR94h+wfBKtGpzRc4sodbaHKxK4Ew= +github.com/slackhq/vitess-addons v0.19.6-0.20241218190308-908d505e2828/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= +github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a h1:tx9dizzufmXHceYP2IWSE8suoB6twcEe3f/+TMawUUE= +github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= 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/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index 0c8c93bb3fa..7f4c897ca5b 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -309,9 +309,9 @@ func postErsCompletion(topologyRecovery *TopologyRecovery, analysisEntry *inst.R // TODO: remove this conditional and 'else' side after vtops-vtorc is used 100%. if strings.HasSuffix(vtopsPath, "vtops-vtorc") { - vtopsExec.RaiseProblem(analysisEntry.AnalyzedInstanceAlias, "orc-dead-tablet") + vtopsExec.RaiseProblem(analysisEntry, topologyRecovery.SuccessorAlias, "orc-dead-tablet") } else { - vtopsExec.RaiseProblem(analysisEntry.AnalyzedInstanceHostname, "orc-dead-tablet") + vtopsExec.RaiseProblem(analysisEntry, topologyRecovery.SuccessorAlias, "orc-dead-tablet") } } } From 56d00c97a2c85b0a1dc87a48acbfe78351f6b506 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 18 Dec 2024 20:51:47 +0100 Subject: [PATCH 06/14] go mod tidy Signed-off-by: Tim Vaillancourt --- go.sum | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.sum b/go.sum index 619e6a1bce7..7a0efa1889a 100644 --- a/go.sum +++ b/go.sum @@ -448,10 +448,6 @@ 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.5 h1:ZrLHvZuMyZWlW9XY6+AEm4BeVC8/R8iNTOtQkKHbSwM= -github.com/slackhq/vitess-addons v0.19.5/go.mod h1:2icrtf8lZyzdEH1r7PoXy8g66D4LG/bIhA9rQUqR+BQ= -github.com/slackhq/vitess-addons v0.19.6-0.20241218190308-908d505e2828 h1:vgjhnLePfSyFf2oR94h+wfBKtGpzRc4sodbaHKxK4Ew= -github.com/slackhq/vitess-addons v0.19.6-0.20241218190308-908d505e2828/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a h1:tx9dizzufmXHceYP2IWSE8suoB6twcEe3f/+TMawUUE= github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= github.com/slok/noglog v0.2.0 h1:1czu4l2EoJ8L92UwdSXXa1Y+c5TIjFAFm2P+mjej95E= From ec9bd772b08d5e6f8b7f4980eae4f6a7c91a4a3d Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 18 Dec 2024 20:55:11 +0100 Subject: [PATCH 07/14] revert cond Signed-off-by: Tim Vaillancourt --- go/vt/vtorc/logic/topology_recovery.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index 7f4c897ca5b..df377ef1419 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -306,13 +306,7 @@ func postErsCompletion(topologyRecovery *TopologyRecovery, analysisEntry *inst.R _ = AuditTopologyRecovery(topologyRecovery, message) _ = inst.AuditOperation(recoveryName, analysisEntry.AnalyzedInstanceAlias, message) _ = AuditTopologyRecovery(topologyRecovery, fmt.Sprintf("%v: successfully promoted %+v", recoveryName, promotedReplica.InstanceAlias)) - - // TODO: remove this conditional and 'else' side after vtops-vtorc is used 100%. - if strings.HasSuffix(vtopsPath, "vtops-vtorc") { - vtopsExec.RaiseProblem(analysisEntry, topologyRecovery.SuccessorAlias, "orc-dead-tablet") - } else { - vtopsExec.RaiseProblem(analysisEntry, topologyRecovery.SuccessorAlias, "orc-dead-tablet") - } + vtopsExec.RaiseProblem(analysisEntry, topologyRecovery.SuccessorAlias, "orc-dead-tablet") } } From d88862903ff54c24dce01b5ae5a8efa4e0fdacc7 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 18 Dec 2024 20:59:07 +0100 Subject: [PATCH 08/14] goimports Signed-off-by: Tim Vaillancourt --- go/vt/vtorc/logic/topology_recovery.go | 1 - 1 file changed, 1 deletion(-) diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index df377ef1419..63254b97803 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -22,7 +22,6 @@ import ( "fmt" "math/rand" "os" - "strings" "time" "github.com/patrickmn/go-cache" From c6250014c4bf93e97074f8c04ea424b7a955f7a4 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 18 Dec 2024 23:41:35 +0100 Subject: [PATCH 09/14] update Signed-off-by: Tim Vaillancourt --- go.mod | 2 +- go.sum | 2 ++ go/vt/vtorc/logic/topology_recovery.go | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e3edb7fba9a..19bf60154dd 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,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.6-0.20241218193729-2cb0c6fc208a + github.com/slackhq/vitess-addons v0.19.6-0.20241218223212-c359277c9cba 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 7a0efa1889a..b5098933ca3 100644 --- a/go.sum +++ b/go.sum @@ -450,6 +450,8 @@ github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5eb github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U= github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a h1:tx9dizzufmXHceYP2IWSE8suoB6twcEe3f/+TMawUUE= github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= +github.com/slackhq/vitess-addons v0.19.6-0.20241218223212-c359277c9cba h1:Nw8VNXw7ujdwCKG4BcPdx+7dLo7DCoa2zEVXnVXZv7g= +github.com/slackhq/vitess-addons v0.19.6-0.20241218223212-c359277c9cba/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= 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/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index 63254b97803..6e4f82e6980 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -85,9 +85,7 @@ var ( recoveriesFailureCounter = stats.NewCountersWithSingleLabel("FailedRecoveries", "Count of the different failed recoveries performed", "RecoveryType", actionableRecoveriesNames...) // vtops - vtopsPath = os.Getenv("VTOPS_PATH") - vtopsService = fmt.Sprintf("vtorc-%s-%s", os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT")) - vtopsExec = external.NewExecVTOps(vtopsPath, vtopsService) + vtopsExec = external.NewExecVTOps() vtopsSlackChannel = os.Getenv("SLACK_CHANNEL") ) From 36dff2e53c04f3e8fe9414815370d9c8353a9ec9 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 9 Jan 2025 15:08:36 +0100 Subject: [PATCH 10/14] update tag Signed-off-by: Tim Vaillancourt --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 19bf60154dd..01d50686345 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,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.6-0.20241218223212-c359277c9cba + github.com/slackhq/vitess-addons v0.19.6 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 b5098933ca3..5bb35c2ed3b 100644 --- a/go.sum +++ b/go.sum @@ -448,10 +448,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.6-0.20241218193729-2cb0c6fc208a h1:tx9dizzufmXHceYP2IWSE8suoB6twcEe3f/+TMawUUE= -github.com/slackhq/vitess-addons v0.19.6-0.20241218193729-2cb0c6fc208a/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= -github.com/slackhq/vitess-addons v0.19.6-0.20241218223212-c359277c9cba h1:Nw8VNXw7ujdwCKG4BcPdx+7dLo7DCoa2zEVXnVXZv7g= -github.com/slackhq/vitess-addons v0.19.6-0.20241218223212-c359277c9cba/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= +github.com/slackhq/vitess-addons v0.19.6 h1:ubi7WdNXXLwprES0On8YTx7Vq9JanzS3Ma9dCgMQZ7I= +github.com/slackhq/vitess-addons v0.19.6/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= 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 3f569cc815dfdca48622f0072f2c86d81ecb81a6 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 9 Jan 2025 19:05:26 +0100 Subject: [PATCH 11/14] fix test Signed-off-by: Tim Vaillancourt --- go/flags/endtoend/vtorc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/go/flags/endtoend/vtorc.txt b/go/flags/endtoend/vtorc.txt index e36c35924b1..ee073dabc0f 100644 --- a/go/flags/endtoend/vtorc.txt +++ b/go/flags/endtoend/vtorc.txt @@ -117,6 +117,7 @@ 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-binary-path string path to the slack vtops binary --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) From 3977bb6d51cd3687fd23872a1a8ebc6c919a0434 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Fri, 10 Jan 2025 15:29:39 +0100 Subject: [PATCH 12/14] fix e2e output Signed-off-by: Tim Vaillancourt --- go/flags/endtoend/vtorc.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/flags/endtoend/vtorc.txt b/go/flags/endtoend/vtorc.txt index ee073dabc0f..5fbfe95dc49 100644 --- a/go/flags/endtoend/vtorc.txt +++ b/go/flags/endtoend/vtorc.txt @@ -118,6 +118,6 @@ Flags: -v, --version print binary version --vmodule vModuleFlag comma-separated list of pattern=N settings for file-filtered logging --vtops-binary-path string path to the slack vtops binary - --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) + --vtops-exec-timeout duration execution timeout for the slack vtops binary (default 10s) + --vtops-max-concurrency int max concurrency for executing the slack vtops binary (default 12) --wait-replicas-timeout duration Duration for which to wait for replica's to respond when issuing RPCs (default 30s) From 0008ae74a89f070e855e23e044f635e68cdd63ba Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Fri, 10 Jan 2025 15:31:33 +0100 Subject: [PATCH 13/14] v0.19.7 Signed-off-by: Tim Vaillancourt --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 01d50686345..ddb73402354 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,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.6 + github.com/slackhq/vitess-addons v0.19.7 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 5bb35c2ed3b..f0dd4198521 100644 --- a/go.sum +++ b/go.sum @@ -448,8 +448,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.6 h1:ubi7WdNXXLwprES0On8YTx7Vq9JanzS3Ma9dCgMQZ7I= -github.com/slackhq/vitess-addons v0.19.6/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= +github.com/slackhq/vitess-addons v0.19.7 h1:3rP5jIjTMAJSInl92ePn6BevACvVVT4DV3oynwuQKRo= +github.com/slackhq/vitess-addons v0.19.7/go.mod h1:slG5BxqN541wVV5Y5tuHE3z1CwCXj9GVRmLX5wkI/zw= 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 07ed7fb91e6ecc2a272dce3be31a175189670aa8 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Fri, 10 Jan 2025 18:29:52 +0100 Subject: [PATCH 14/14] fix CI Signed-off-by: Tim Vaillancourt --- .github/workflows/check_make_vtadmin_authz_testgen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_make_vtadmin_authz_testgen.yml b/.github/workflows/check_make_vtadmin_authz_testgen.yml index 601fea2981c..2e723f44133 100644 --- a/.github/workflows/check_make_vtadmin_authz_testgen.yml +++ b/.github/workflows/check_make_vtadmin_authz_testgen.yml @@ -64,7 +64,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true' run: | sudo apt-get update - sudo apt-get install -y make unzip g++ etcd curl git wget + sudo apt-get install -y make unzip g++ etcd-client etcd-server curl git wget sudo service etcd stop go mod download go install golang.org/x/tools/cmd/goimports@latest