public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(unified-storage): use logger from context for dualwriter (#106473)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2025-06-10 15:33:14 +02:00
committed by GitHub
parent ed1da3456c
commit 1a216a8fff
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/legacysql/dualwrite/static.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"github.com/grafana/grafana-app-sdk/logging"
"github.com/grafana/grafana/pkg/apiserver/rest"
"github.com/grafana/grafana/pkg/setting"
)
@@ -41,16 +40,14 @@ func (m *staticService) SetMode(gr schema.GroupResource, mode rest.DualWriterMod
}
func (m *staticService) NewStorage(gr schema.GroupResource, legacy rest.Storage, unified rest.Storage) (rest.Storage, error) {
log := logging.DefaultLogger.With("dualwrite", gr.String())
config := m.cfg.UnifiedStorage[gr.String()]
switch config.DualWriterMode {
case rest.Mode1:
return &dualWriter{log: log, legacy: legacy, unified: unified, errorIsOK: true}, nil
return &dualWriter{legacy: legacy, unified: unified, errorIsOK: true}, nil
case rest.Mode2:
return &dualWriter{log: log, legacy: legacy, unified: unified}, nil
return &dualWriter{legacy: legacy, unified: unified}, nil
case rest.Mode3:
return &dualWriter{log: log, legacy: legacy, unified: unified, readUnified: true}, nil
return &dualWriter{legacy: legacy, unified: unified, readUnified: true}, nil
case rest.Mode4, rest.Mode5:
return unified, nil // use unified directly
case rest.Mode0: