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

Provisioning: Skip incremental rync ref didn't change (#109174)

Browse Source 
Skip incremental sync if ref didn't change

Avoids unnecessary load on the job queue by not queuing if the ref
didn't change from the last sync.
This commit is contained in:
Roberto Jiménez Sánchez
2025-08-05 13:26:47 +02:00
committed by GitHub
parent 1021f05e32
commit d874bc08b7
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/provisioning/controller/repository.go
+23 -3
View File
@@ -331,7 +331,7 @@ func (rc *RepositoryController) runHooks(ctx context.Context, repo repository.Re
return patchOperations, nil
}
func (rc *RepositoryController) determineSyncStrategy(ctx context.Context, obj *provisioning.Repository, shouldResync bool, healthStatus provisioning.HealthStatus) *provisioning.SyncJobOptions {
func (rc *RepositoryController) determineSyncStrategy(ctx context.Context, obj *provisioning.Repository, repo repository.Repository, shouldResync bool, healthStatus provisioning.HealthStatus) *provisioning.SyncJobOptions {
logger := logging.FromContext(ctx)
switch {
@@ -354,7 +354,27 @@ func (rc *RepositoryController) determineSyncStrategy(ctx context.Context, obj *
logger.Info("full sync for spec change")
return &provisioning.SyncJobOptions{}
case shouldResync:
logger.Info("incremental sync for sync interval")
// Continue to see if we could skip for other reasons
versioned, ok := repo.(repository.Versioned)
// If the repository is not versioned, we don't have a way to check for incremental updates
if !ok {
logger.Info("full sync on interval for non-versioned repository")
return &provisioning.SyncJobOptions{}
}
latestRef, err := versioned.LatestRef(ctx)
if err != nil {
logger.Warn("incremental sync on interval without knowing if ref has actually changed", "error", err)
return &provisioning.SyncJobOptions{Incremental: true}
}
// Only resync if the latest ref is different from the last synced ref
if latestRef == obj.Status.Sync.LastRef {
logger.Info("skip incremental sync as reference is the same")
return nil
}
logger.Info("incremental sync on interval")
return &provisioning.SyncJobOptions{Incremental: true}
default:
return nil
@@ -503,7 +523,7 @@ func (rc *RepositoryController) process(item *queueItem) error {
}
// determine the sync strategy and sync status to apply
syncOptions := rc.determineSyncStrategy(ctx, obj, shouldResync, healthStatus)
syncOptions := rc.determineSyncStrategy(ctx, obj, repo, shouldResync, healthStatus)
if syncStatus := rc.determineSyncStatus(obj, syncOptions); syncStatus != nil {
patchOperations = append(patchOperations, map[string]interface{}{
"op": "replace",