Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-05 01:01:09 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

follow-up after 77f22fdb8d (#6458)

Browse Source 
* fixes linter error
* simplify code a bit
* fixes bug with incorrectly set configSuccess metric. It was not set to
1 in case of config rollback

Signed-off-by: f41gh7 <nik@victoriametrics.com>
This commit is contained in:
Nikolay 2024-06-11 12:08:00 +02:00 committed by GitHub
parent 77f22fdb8d
commit 66fbea70a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/vminsert/relabel/relabel.go
View File

@ -58,42 +58,39 @@ func Init() {
tickerCh = ticker.C
defer ticker.Stop()
}
var noChangesLogFn func()
for {
select {
case <-sighupCh:
configReloads.Inc()
logger.Infof("received SIGHUP; reloading -relabelConfig=%q...", *relabelConfig)
pcsNew, err := loadRelabelConfig()
if err != nil {
configReloadErrors.Inc()
configSuccess.Set(0)
logger.Errorf("cannot load the updated relabelConfig: %s; preserving the previous config", err)
continue
}
if pcsNew.String() == pcs.String() {
noChangesLogFn = func() {
logger.Infof("nothing changed in %q", relabelConfig)
continue
}
pcs = pcsNew
pcsGlobal.Store(pcsNew)
case <-tickerCh:
pcsNew, err := loadRelabelConfig()
if err != nil {
configReloadErrors.Inc()
configSuccess.Set(0)
logger.Errorf("cannot load the updated relabelConfig: %s; preserving the previous config", err)
continue
}
if pcsNew.String() == pcs.String() {
continue
}
pcs = pcsNew
pcsGlobal.Store(pcsNew)
// silently skip logging for the unchanged config files
noChangesLogFn = func() {}
case <-globalStopChan:
logger.Infof("stopping relabel")
logger.Infof("stopping relabel config reloader")
return
}
pcsNew, err := loadRelabelConfig()
if err != nil {
configReloadErrors.Inc()
configSuccess.Set(0)
logger.Errorf("cannot load the updated relabelConfig: %s; preserving the previous config", err)
continue
}
if pcsNew.String() == pcs.String() {
// set success to 1 since previous reload could have been unsuccessful
// do not update configTimestamp as config version remains old.
configSuccess.Set(1)
noChangesLogFn()
continue
}
pcs = pcsNew
pcsGlobal.Store(pcsNew)
configSuccess.Set(1)
configTimestamp.Set(fasttime.UnixTimestamp())
logger.Infof("successfully reloaded -relabelConfig=%q", *relabelConfig)
@ -101,6 +98,7 @@ func Init() {
}()
}
// Stop stops relabel config reloader watchers
func Stop() {
if len(*relabelConfig) == 0 {
return