Skip to content

Commit c4762b1

Browse files
authored
[*] remove obsolete unreachable map (#672)
1 parent d1c3e55 commit c4762b1

File tree

3 files changed

+0
-22
lines changed

3 files changed

+0
-22
lines changed

internal/reaper/cache.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ var MonitoredDatabasesSettings = make(map[string]MonitoredDatabaseSettings)
1818
var MonitoredDatabasesSettingsLock = sync.RWMutex{}
1919
var MonitoredDatabasesSettingsGetLock = make(map[string]*sync.RWMutex) // synchronize initial PG version detection to 1 instance for each defined host
2020

21-
var unreachableDBsLock sync.RWMutex
22-
var unreachableDB = make(map[string]time.Time)
23-
2421
var lastDBSizeMB = make(map[string]int64)
2522
var lastDBSizeFetchTime = make(map[string]time.Time) // cached for DB_SIZE_CACHING_INTERVAL
2623
var lastDBSizeCheckLock sync.RWMutex

internal/reaper/database.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -891,18 +891,6 @@ func CloseResourcesForRemovedMonitoredDBs(metricsWriter sinks.Writer, currentDBs
891891
}
892892
}
893893

894-
func SetDBUnreachableState(dbUnique string) {
895-
unreachableDBsLock.Lock()
896-
unreachableDB[dbUnique] = time.Now()
897-
unreachableDBsLock.Unlock()
898-
}
899-
900-
func ClearDBUnreachableStateIfAny(dbUnique string) {
901-
unreachableDBsLock.Lock()
902-
delete(unreachableDB, dbUnique)
903-
unreachableDBsLock.Unlock()
904-
}
905-
906894
func SetUndersizedDBState(dbUnique string, state bool) {
907895
undersizedDBsLock.Lock()
908896
undersizedDBs[dbUnique] = state

internal/reaper/reaper.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ func (r *Reaper) Reap(ctx context.Context) (err error) {
296296
logger.WithField("source", db).WithField("metric", metric).Info("stoppin gatherer...")
297297
cancelFunc()
298298
delete(cancelFuncs, dbMetric)
299-
ClearDBUnreachableStateIfAny(db)
300299
if err := r.SinksWriter.SyncMetric(db, metric, "remove"); err != nil {
301300
logger.Error(err)
302301
}
@@ -644,10 +643,6 @@ func FetchMetrics(ctx context.Context,
644643
goto send_to_storageChannel
645644
}
646645

647-
if strings.Contains(err.Error(), "connection refused") {
648-
SetDBUnreachableState(msg.DBUniqueName)
649-
}
650-
651646
log.GetLogger(ctx).
652647
WithFields(map[string]any{"source": msg.DBUniqueName, "metric": msg.MetricName}).
653648
WithError(err).Error("failed to fetch metrics")
@@ -656,8 +651,6 @@ func FetchMetrics(ctx context.Context,
656651
}
657652

658653
log.GetLogger(ctx).WithFields(map[string]any{"source": msg.DBUniqueName, "metric": msg.MetricName, "rows": len(data)}).Info("measurements fetched")
659-
ClearDBUnreachableStateIfAny(msg.DBUniqueName)
660-
661654
}
662655

663656
if isCacheable && opts.Metrics.InstanceLevelCacheMaxSeconds > 0 && msg.Interval.Seconds() > float64(opts.Metrics.InstanceLevelCacheMaxSeconds) {

0 commit comments

Comments
 (0)