IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

search: close unused reader and writer on re-indexing (#49458)

Browse Source
This commit is contained in:
Alexander Emelin 2022-05-24 09:42:21 +03:00 committed by GitHub
parent 5eb20739c2
commit 1e7e149ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/searchV2/index.go
View File

@ -235,6 +235,12 @@ func (i *dashboardIndex) buildOrgIndex(ctx context.Context, orgID int64) (int, e
"orgSearchDashboardCount", len(dashboards)) "orgSearchDashboardCount", len(dashboards))
i.mu.Lock() i.mu.Lock()
if oldReader, ok := i.perOrgReader[orgID]; ok {
_ = oldReader.Close()
}
if oldWriter, ok := i.perOrgWriter[orgID]; ok {
_ = oldWriter.Close()
}
i.perOrgReader[orgID] = reader i.perOrgReader[orgID] = reader
i.perOrgWriter[orgID] = writer i.perOrgWriter[orgID] = writer
i.mu.Unlock() i.mu.Unlock()
@ -347,6 +353,7 @@ func (i *dashboardIndex) applyDashboardEvent(ctx context.Context, orgID int64, d
// Skip event for org not yet fully indexed. // Skip event for org not yet fully indexed.
return nil return nil
} }
// TODO: should we release index lock while performing removeDashboard/updateDashboard?
reader, ok := i.perOrgReader[orgID] reader, ok := i.perOrgReader[orgID]
if !ok { if !ok {
// Skip event for org not yet fully indexed. // Skip event for org not yet fully indexed.
@ -364,6 +371,7 @@ func (i *dashboardIndex) applyDashboardEvent(ctx context.Context, orgID int64, d
if err != nil { if err != nil {
return err return err
} }
_ = reader.Close()
i.perOrgReader[orgID] = newReader i.perOrgReader[orgID] = newReader
return nil return nil
} }