Zanzana: Run reconciliation in its own service (#100361)
* Zanzana: Start reconciliation in its own service * cleanup * update go workspaces * refactor * remove unused code * move func definition
This commit is contained in:
@@ -14,6 +14,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/infra/log"
|
||||
"github.com/grafana/grafana/pkg/infra/serverlock"
|
||||
"github.com/grafana/grafana/pkg/services/authz/zanzana"
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
"github.com/grafana/grafana/pkg/services/folder"
|
||||
"github.com/grafana/grafana/pkg/services/org"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
@@ -25,12 +26,12 @@ var tracer = otel.Tracer("github.com/grafana/grafana/pkg/accesscontrol/migrator"
|
||||
// We should rewrite the migration after we have "migrated" all possible actions
|
||||
// into our schema.
|
||||
type ZanzanaReconciler struct {
|
||||
cfg *setting.Cfg
|
||||
log log.Logger
|
||||
|
||||
store db.DB
|
||||
client zanzana.Client
|
||||
lock *serverlock.ServerLockService
|
||||
cfg *setting.Cfg
|
||||
log log.Logger
|
||||
features featuremgmt.FeatureToggles
|
||||
store db.DB
|
||||
client zanzana.Client
|
||||
lock *serverlock.ServerLockService
|
||||
// reconcilers are migrations that tries to reconcile the state of grafana db to zanzana store.
|
||||
// These are run periodically to try to maintain a consistent state.
|
||||
reconcilers []resourceReconciler
|
||||
@@ -38,13 +39,14 @@ type ZanzanaReconciler struct {
|
||||
globalReconcilers []resourceReconciler
|
||||
}
|
||||
|
||||
func NewZanzanaReconciler(cfg *setting.Cfg, client zanzana.Client, store db.DB, lock *serverlock.ServerLockService, folderService folder.Service) *ZanzanaReconciler {
|
||||
func ProvideZanzanaReconciler(cfg *setting.Cfg, features featuremgmt.FeatureToggles, client zanzana.Client, store db.DB, lock *serverlock.ServerLockService, folderService folder.Service) *ZanzanaReconciler {
|
||||
zanzanaReconciler := &ZanzanaReconciler{
|
||||
cfg: cfg,
|
||||
log: log.New("zanzana.reconciler"),
|
||||
client: client,
|
||||
lock: lock,
|
||||
store: store,
|
||||
cfg: cfg,
|
||||
log: log.New("zanzana.reconciler"),
|
||||
features: features,
|
||||
client: client,
|
||||
lock: lock,
|
||||
store: store,
|
||||
reconcilers: []resourceReconciler{
|
||||
newResourceReconciler(
|
||||
"team memberships",
|
||||
@@ -119,6 +121,14 @@ func NewZanzanaReconciler(cfg *setting.Cfg, client zanzana.Client, store db.DB,
|
||||
return zanzanaReconciler
|
||||
}
|
||||
|
||||
// Run implements registry.BackgroundService
|
||||
func (r *ZanzanaReconciler) Run(ctx context.Context) error {
|
||||
if r.features.IsEnabledGlobally(featuremgmt.FlagZanzana) {
|
||||
return r.Reconcile(ctx)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Reconcile schedules as job that will run and reconcile resources between
|
||||
// legacy access control and zanzana.
|
||||
func (r *ZanzanaReconciler) Reconcile(ctx context.Context) error {
|
||||
@@ -137,13 +147,6 @@ func (r *ZanzanaReconciler) Reconcile(ctx context.Context) error {
|
||||
}
|
||||
}
|
||||
|
||||
// ReconcileSync runs reconciliation and returns. Useful for tests to perform
|
||||
// reconciliation in a synchronous way.
|
||||
func (r *ZanzanaReconciler) ReconcileSync(ctx context.Context) error {
|
||||
r.reconcile(ctx)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *ZanzanaReconciler) reconcile(ctx context.Context) {
|
||||
runGlobal := func(ctx context.Context) {
|
||||
for _, reconciler := range r.globalReconcilers {
|
||||
|
||||
Reference in New Issue
Block a user