[-] remove obsolete undersizedDBs and recoveryIgnoredDBs maps (#673)

Author: pashagolub

internal/reaper/cache.go

@@ -23,12 +23,6 @@ var lastDBSizeFetchTime = make(map[string]time.Time) // cached for DB_SIZE_CACHI
 var lastDBSizeCheckLock sync.RWMutex
 
 var prevLoopMonitoredDBs sources.SourceConns // to be able to detect DBs removed from config
-var undersizedDBs = make(map[string]bool)    // DBs below the --min-db-size-mb limit, if set
-var undersizedDBsLock = sync.RWMutex{}
-var recoveryIgnoredDBs = make(map[string]bool) // DBs in recovery state and OnlyIfMaster specified in config
-var recoveryIgnoredDBsLock = sync.RWMutex{}
-
-var hostMetricIntervalMap = make(map[string]float64) // [db1_metric] = 30
 
 var lastSQLFetchError sync.Map
 

internal/reaper/database.go

@@ -890,39 +890,3 @@ func CloseResourcesForRemovedMonitoredDBs(metricsWriter sinks.Writer, currentDBs
 		_ = metricsWriter.SyncMetric(roleChangedDB, "", "remove")
 	}
 }
-
-func SetUndersizedDBState(dbUnique string, state bool) {
-	undersizedDBsLock.Lock()
-	undersizedDBs[dbUnique] = state
-	undersizedDBsLock.Unlock()
-}
-
-func IsDBUndersized(dbUnique string) bool {
-	undersizedDBsLock.RLock()
-	defer undersizedDBsLock.RUnlock()
-	undersized, ok := undersizedDBs[dbUnique]
-	if ok {
-		return undersized
-	}
-	return false
-}
-
-func SetRecoveryIgnoredDBState(dbUnique string, state bool) {
-	recoveryIgnoredDBsLock.Lock()
-	recoveryIgnoredDBs[dbUnique] = state
-	recoveryIgnoredDBsLock.Unlock()
-}
-
-func IsDBIgnoredBasedOnRecoveryState(dbUnique string) bool {
-	recoveryIgnoredDBsLock.RLock()
-	defer recoveryIgnoredDBsLock.RUnlock()
-	recoveryIgnored, ok := recoveryIgnoredDBs[dbUnique]
-	if ok {
-		return recoveryIgnored
-	}
-	return false
-}
-
-func IsDBDormant(dbUnique string) bool {
-	return IsDBUndersized(dbUnique) || IsDBIgnoredBasedOnRecoveryState(dbUnique)
-}

internal/reaper/reaper.go

@@ -139,10 +139,8 @@ func (r *Reaper) Reap(ctx context.Context) (err error) {
 						if DBSizeMB < r.Sources.MinDbSizeMB {
 							srcL.Infof("ignored due to the --min-db-size-mb filter, current size %d MB", DBSizeMB)
 							hostsToShutDownDueToRoleChange[monitoredSource.Name] = true // for the case when DB size was previosly above the threshold
-							SetUndersizedDBState(monitoredSource.Name, true)
 							continue
 						}
-						SetUndersizedDBState(monitoredSource.Name, false)
 					}
 				}
 				ver, err := GetMonitoredDatabaseSettings(ctx, monitoredSource, false)
@@ -151,7 +149,6 @@ func (r *Reaper) Reap(ctx context.Context) (err error) {
 					if ver.IsInRecovery && monitoredSource.OnlyIfMaster {
 						srcL.Info("to be removed from monitoring due to 'master only' property and status change")
 						hostsToShutDownDueToRoleChange[monitoredSource.Name] = true
-						SetRecoveryIgnoredDBState(monitoredSource.Name, true)
 						continue
 					} else if lastKnownStatusInRecovery != ver.IsInRecovery {
 						if ver.IsInRecovery && len(monitoredSource.MetricsStandby) > 0 {
@@ -162,7 +159,6 @@ func (r *Reaper) Reap(ctx context.Context) (err error) {
 							srcL.Warning("Switching metrics collection to primary config...")
 							metricConfig = monitoredSource.Metrics
 							hostLastKnownStatusInRecovery[monitoredSource.Name] = false
-							SetRecoveryIgnoredDBState(monitoredSource.Name, false)
 						}
 					}
 				}
@@ -192,7 +188,6 @@ func (r *Reaper) Reap(ctx context.Context) (err error) {
 
 				if metricDefOk && !chOk { // initialize a new per db/per metric control channel
 					if interval > 0 {
-						hostMetricIntervalMap[dbMetric] = interval
 						srcL.WithField("metric", metric).WithField("interval", interval).Info("starting gatherer")
 						metricCtx, cancelFunc := context.WithCancel(ctx)
 						cancelFuncs[dbMetric] = cancelFunc
@@ -231,12 +226,6 @@ func (r *Reaper) Reap(ctx context.Context) (err error) {
 						srcL.WithField("metric", metric).Warning("metric definition not found")
 						lastSQLFetchError.Store(metric, time.Now().Unix())
 					}
-				} else {
-					// check if interval has changed
-					if hostMetricIntervalMap[dbMetric] != interval {
-						srcL.WithField("metric", metric).Info("updating interval...")
-						hostMetricIntervalMap[dbMetric] = interval
-					}
 				}
 			}
 		}