log when recovery is successful/failed + fix messages

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
slackhq · Sep 17, 2024 · 9474e9d · 9474e9d
1 parent 4994dc7
commit 9474e9d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go
@@ -716,21 +716,22 @@ func executeCheckAndRecoverFunction(analysisEntry *inst.ReplicationAnalysis) (er
  log.Infof("executeCheckAndRecoverFunction: proceeding with %+v recovery on %+v; isRecoverable?: %+v", analysisEntry.Analysis, analysisEntry.AnalyzedInstanceAlias, isActionableRecovery)
  }
 
- if !isActionableRecovery {
- vtopsExec.SendSlackMessage(fmt.Sprintf("No actionable recovery on %s for problem %s.", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis), vtopsSlackChannel, true)
- }
-
  recoveryAttempted, topologyRecovery, err := getCheckAndRecoverFunction(checkAndRecoverFunctionCode)(ctx, analysisEntry)
  if !recoveryAttempted {
+ log.Infof("No recovery attempted on %s for problem %s. Error: %s", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis, err.Error())
  return err
  }
  recoveryName := getRecoverFunctionName(checkAndRecoverFunctionCode)
  recoveriesCounter.Add(recoveryName, 1)
  if err != nil {
- vtopsExec.SendSlackMessage(fmt.Sprintf("Recovery failed on %s for problem %s. Error: %s", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis, err.Error()), vtopsSlackChannel, true)
+ message := fmt.Sprintf("Recovery failed on %s for problem %s. Error: %s", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis, err.Error())
+ log.Info(message)
+ vtopsExec.SendSlackMessage(message, vtopsSlackChannel, true)
  recoveriesFailureCounter.Add(recoveryName, 1)
  } else {
- vtopsExec.SendSlackMessage(fmt.Sprintf("Recovery succeeded on %s for problem %s.", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis), vtopsSlackChannel, true)
+ message := fmt.Sprintf("Recovery succeeded on %s for problem %s.", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis)
+ log.Info(message)
+ vtopsExec.SendSlackMessage(message, vtopsSlackChannel, true)
  recoveriesSuccessfulCounter.Add(recoveryName, 1)
  }
  if topologyRecovery == nil {