use logic.DisableRecovery() to disable

Signed-off-by: Tim Vaillancourt <[email protected]>

go/cmd/vtorc/cli/cli.go

@@ -68,6 +68,13 @@ func run(cmd *cobra.Command, args []string) {
 
 	// Log final config values to debug if something goes wrong.
 	config.LogConfigValues()
+	if !config.Config.AllowRecovery {
+		log.Info("--allow-recoveries is set to false, disabling recoveries")
+		if err := logic.DisableRecovery(); err != nil {
+			log.Errorf("failed to disable recoveries: %+v", err)
+			return
+		}
+	}
 	server.StartVTOrcDiscovery()
 
 	server.RegisterVTOrcAPIEndpoints()

go/vt/vtorc/logic/vtorc.go

@@ -337,19 +337,14 @@ func ContinuousDiscovery() {
 
 	healthTick := time.Tick(config.HealthPollSeconds * time.Second)
 	caretakingTick := time.Tick(time.Minute)
+	recoveryTick := time.Tick(time.Duration(config.Config.RecoveryPollSeconds) * time.Second)
 	tabletTopoTick := OpenTabletDiscovery()
 	var recoveryEntrance int64
 	var snapshotTopologiesTick <-chan time.Time
 	if config.Config.SnapshotTopologiesIntervalHours > 0 {
 		snapshotTopologiesTick = time.Tick(time.Duration(config.Config.SnapshotTopologiesIntervalHours) * time.Hour)
 	}
 
-	recoveryTicker := time.NewTicker(time.Duration(config.Config.RecoveryPollSeconds) * time.Second)
-	defer recoveryTicker.Stop()
-	if !config.Config.AllowRecovery {
-		recoveryTicker.Stop()
-	}
-
 	runCheckAndRecoverOperationsTimeRipe := func() bool {
 		return time.Since(continuousDiscoveryStartTime) >= checkAndRecoverWaitPeriod
 	}
@@ -383,7 +378,7 @@ func ContinuousDiscovery() {
 					go ExpireTopologyRecoveryStepsHistory()
 				}
 			}()
-		case <-recoveryTicker.C:
+		case <-recoveryTick:
 			go func() {
 				if IsLeaderOrActive() {
 					go ClearActiveFailureDetections()