Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup obsolete local files for alertmanager. #3910

Merged
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Marco Pracucci <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
pstibrany and pracucci committed Mar 10, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 8e944e071ecc278a9cb96275b3aa023b812f8842
12 changes: 6 additions & 6 deletions pkg/alertmanager/multitenant.go
Original file line number Diff line number Diff line change
@@ -511,14 +511,14 @@ func (am *MultitenantAlertmanager) starting(ctx context.Context) (err error) {
// TODO: Remove in Cortex 1.10.
func (am *MultitenantAlertmanager) migrateStateFilesToPerTenantDirectories() error {
migrate := func(from, to string) error {
level.Info(am.logger).Log("msg", "migrating AM state", "from", from, "to", to)
level.Info(am.logger).Log("msg", "migrating alertmanager state", "from", from, "to", to)
err := os.Rename(from, to)
return errors.Wrapf(err, "failed to migrate from %v to %v", from, to)
return errors.Wrapf(err, "failed to migrate alertmanager state from %v to %v", from, to)
}

st, err := am.getObsoleteFilesPerUser()
if err != nil {
return errors.Wrap(err, "failed to migrate existing files")
return errors.Wrap(err, "failed to migrate alertmanager state files")
}

for userID, files := range st {
@@ -593,7 +593,7 @@ func (am *MultitenantAlertmanager) getObsoleteFilesPerUser() (map[string]obsolet
v.templatesDir = filepath.Join(fullPath, d.Name())
result[d.Name()] = v
} else {
level.Warn(am.logger).Log("msg", "ignoring unknown local file", "file", filepath.Join(fullPath, d.Name()))
level.Warn(am.logger).Log("msg", "ignoring unknown local file while migrating local alertmanager state files", "file", filepath.Join(fullPath, d.Name()))
}
}
continue
@@ -613,7 +613,7 @@ func (am *MultitenantAlertmanager) getObsoleteFilesPerUser() (map[string]obsolet
result[userID] = v

default:
level.Warn(am.logger).Log("msg", "ignoring unknown local data file", "file", fullPath)
level.Warn(am.logger).Log("msg", "ignoring unknown local data file while migrating local alertmanager state files", "file", fullPath)
}
}

@@ -1122,7 +1122,7 @@ func (am *MultitenantAlertmanager) getPerUserDirectories() map[string]string {
fullPath := filepath.Join(am.cfg.DataDir, f.Name())

if !f.IsDir() {
level.Warn(am.logger).Log("msg", "ignoring local file", "file", fullPath)
level.Warn(am.logger).Log("msg", "ignoring unexpected file while scanning local alertmanager configs", "file", fullPath)
continue
}