slack-19.0: use slackhq/[email protected] (#575)

* `slack-19.0`: use `slackhq/[email protected]` Signed-off-by: Tim Vaillancourt <[email protected]> * simplify vtorc service name Signed-off-by: Tim Vaillancourt <[email protected]> * simplify vtorc service name 2 Signed-off-by: Tim Vaillancourt <[email protected]> * add temp conditional for vtops-vtorc Signed-off-by: Tim Vaillancourt <[email protected]> * pre-test v0.19.6 tag w/commit Signed-off-by: Tim Vaillancourt <[email protected]> * go mod tidy Signed-off-by: Tim Vaillancourt <[email protected]> * revert cond Signed-off-by: Tim Vaillancourt <[email protected]> * goimports Signed-off-by: Tim Vaillancourt <[email protected]> * update Signed-off-by: Tim Vaillancourt <[email protected]> * update tag Signed-off-by: Tim Vaillancourt <[email protected]> * fix test Signed-off-by: Tim Vaillancourt <[email protected]> * fix e2e output Signed-off-by: Tim Vaillancourt <[email protected]> * v0.19.7 Signed-off-by: Tim Vaillancourt <[email protected]> * fix CI Signed-off-by: Tim Vaillancourt <[email protected]> --------- Signed-off-by: Tim Vaillancourt <[email protected]>
slackhq · Jan 10, 2025 · bb6271b · bb6271b
1 parent 7e0c772
commit bb6271b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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

diff --git 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.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
@@ -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.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=

diff --git 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-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-binary-path string                                    path to the slack vtops binary
+      --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)
diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go
@@ -85,8 +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"))
-	vtopsExec         = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), vtopsService, os.Getenv("HOSTNAME"))
+	vtopsExec         = external.NewExecVTOps()
 	vtopsSlackChannel = os.Getenv("SLACK_CHANNEL")
 )
 
@@ -304,7 +303,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))
-		vtopsExec.RaiseProblem(analysisEntry.AnalyzedInstanceHostname, "orc-dead-tablet")
+		vtopsExec.RaiseProblem(analysisEntry, topologyRecovery.SuccessorAlias, "orc-dead-tablet")
 	}
 }