From fbf3fe69b5a31741e503f54e965159d3cfc26a6b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:25:36 -0400 Subject: [PATCH] Alerting: cache general folder in migration based on org id (#55620) (#55691) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f3a307778aebe193a063ec45c4d0eb7bd8b82ccd) Co-authored-by: Jean-Philippe Quéméner --- pkg/services/sqlstore/migrations/ualert/ualert.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go index ca98d5ad292..f24be72d988 100644 --- a/pkg/services/sqlstore/migrations/ualert/ualert.go +++ b/pkg/services/sqlstore/migrations/ualert/ualert.go @@ -257,6 +257,8 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error { // cache for folders created for dashboards that have custom permissions folderCache := make(map[string]*dashboard) + // cache for the general folders + generalFolderCache := make(map[int64]*dashboard) // Store of newly created rules to later create routes rulesPerOrg := make(map[int64]map[string]dashAlert) @@ -333,7 +335,7 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error { } folder = &f default: - f, ok := folderCache[GENERAL_FOLDER] + f, ok := generalFolderCache[dash.OrgId] if !ok { // get or create general folder f, err = folderHelper.getOrCreateGeneralFolder(dash.OrgId) @@ -343,7 +345,7 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error { AlertId: da.Id, } } - folderCache[GENERAL_FOLDER] = f + generalFolderCache[dash.OrgId] = f } // No need to assign default permissions to general folder // because they are included to the query result if it's a folder with no permissions