aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-02-02 15:09:33 -05:00
Code

Skip deletion error for action artifacts (#33476)

Browse Source
This commit is contained in:
wxiaoguang 2025-02-02 22:48:19 +08:00 committed by GitHub
parent aec0b7ec34
commit 869f8fdbe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/actions/cleanup.go
View File

@ -52,9 +52,9 @@ func cleanExpiredArtifacts(taskCtx context.Context) error {
} }
if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil { if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
log.Error("Cannot delete artifact %d: %v", artifact.ID, err) log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
continue // go on
} }
log.Info("Artifact %d set expired", artifact.ID) log.Info("Artifact %d is deleted (due to expiration)", artifact.ID)
} }
return nil return nil
} }
@ -76,9 +76,9 @@ func cleanNeedDeleteArtifacts(taskCtx context.Context) error {
} }
if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil { if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
log.Error("Cannot delete artifact %d: %v", artifact.ID, err) log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
continue // go on
} }
log.Info("Artifact %d set deleted", artifact.ID) log.Info("Artifact %d is deleted (due to pending deletion)", artifact.ID)
} }
if len(artifacts) < deleteArtifactBatchSize { if len(artifacts) < deleteArtifactBatchSize {
log.Debug("No more artifacts pending deletion") log.Debug("No more artifacts pending deletion")
@ -103,8 +103,7 @@ func CleanupLogs(ctx context.Context) error {
for _, task := range tasks { for _, task := range tasks {
if err := actions_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename); err != nil { if err := actions_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename); err != nil {
log.Error("Failed to remove log %s (in storage %v) of task %v: %v", task.LogFilename, task.LogInStorage, task.ID, err) log.Error("Failed to remove log %s (in storage %v) of task %v: %v", task.LogFilename, task.LogInStorage, task.ID, err)
// do not return error here, continue to next task // do not return error here, go on
continue
} }
task.LogIndexes = nil // clear log indexes since it's a heavy field task.LogIndexes = nil // clear log indexes since it's a heavy field
task.LogExpired = true task.LogExpired = true