f0c95a0a10
* Implement hierarchical error handling for folder creation failures This commit implements hierarchical error handling to improve sync robustness when folder creation fails. Instead of failing the entire sync, the system now: 1. Tracks failed folder creations and automatically skips nested resources 2. Records skipped resources with FileActionIgnored (doesn't count toward error limits) 3. Allows other folder hierarchies to continue processing 4. Prevents folder deletion when child resource deletions fail Key Changes: - Add PathCreationError type to track which folder path failed - Modify progress recorder to automatically detect and track failures via Record() - Add IsNestedUnderFailedCreation() and HasFailedDeletionsUnder() checks - Update full and incremental sync to skip nested resources after folder failures - Deletions proceed even if parent folder creation failed (resource may exist from previous sync) - FileActionIgnored results don't count toward error limits Example behavior improvement: Before: /monitoring folder creation fails → all nested resources fail → other folders never processed After: /monitoring folder creation fails → nested resources ignored → /applications folder succeeds 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * provisioning: refactor hierarchical errors in folder management. * Move test to the corresponding package * Refactor timeout handling in applyChanges functions - Introduced wrapWithTimeout function to streamline timeout context management for applyChange calls. - Updated applyFoldersSerially and applyIncrementalChanges to utilize the new timeout wrapper. - Removed redundant logging and error handling code related to timeout in favor of centralized handling in wrapWithTimeout. - Adjusted test expectations to reflect changes in error reporting for context deadlines. --------- Co-authored-by: Roberto Jimenez Sanchez <roberto.jimenez@grafana.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
53 lines
2.3 KiB
Go
53 lines
2.3 KiB
Go
package jobs
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
|
|
"github.com/grafana/grafana/apps/provisioning/pkg/repository"
|
|
)
|
|
|
|
// RepoGetter is a function that can be called to get a repository by name
|
|
//
|
|
//go:generate mockery --name RepoGetter --structname MockRepoGetter --inpackage --filename repo_getter_mock.go --with-expecter
|
|
type RepoGetter interface {
|
|
GetRepository(ctx context.Context, namespace, name string) (repository.Repository, error)
|
|
}
|
|
|
|
// JobProgressRecorder is a function that can be called to record the progress of a job
|
|
//
|
|
//go:generate mockery --name JobProgressRecorder --structname MockJobProgressRecorder --inpackage --filename job_progress_recorder_mock.go --with-expecter
|
|
type JobProgressRecorder interface {
|
|
Started() time.Time
|
|
Record(ctx context.Context, result JobResourceResult)
|
|
ResetResults()
|
|
SetFinalMessage(ctx context.Context, msg string)
|
|
SetMessage(ctx context.Context, msg string)
|
|
SetTotal(ctx context.Context, total int)
|
|
TooManyErrors() error
|
|
StrictMaxErrors(maxErrors int)
|
|
SetRefURLs(ctx context.Context, refURLs *provisioning.RepositoryURLs)
|
|
Complete(ctx context.Context, err error) provisioning.JobStatus
|
|
// HasDirPathFailedCreation checks if a path has any folder creations that failed
|
|
HasDirPathFailedCreation(path string) bool
|
|
// HasDirPathFailedDeletion checks if a folderPath has any folder deletions that failed
|
|
HasDirPathFailedDeletion(folderPath string) bool
|
|
}
|
|
|
|
// Worker is a worker that can process a job
|
|
//
|
|
//go:generate mockery --name Worker --structname MockWorker --inpackage --filename worker_mock.go --with-expecter
|
|
type Worker interface {
|
|
IsSupported(ctx context.Context, job provisioning.Job) bool
|
|
// Process the job. The job status should be updated as the job progresses.
|
|
//
|
|
// The job spec and metadata MUST not be modified in the storage layer while this is running. All updates go via the progress type.
|
|
Process(ctx context.Context, repo repository.Repository, job provisioning.Job, progress JobProgressRecorder) error
|
|
}
|
|
|
|
// ProgressFn is a function that can be called to update the progress of a job
|
|
//
|
|
//go:generate mockery --name ProgressFn --structname MockProgressFn --inpackage --filename progress_fn_mock.go --with-expecter
|
|
type ProgressFn func(ctx context.Context, status provisioning.JobStatus) error
|