Skip to content

Commit 8de8972

Browse files
authored
fix: allow actions artifacts storage migration to complete succesfully (#31251)
Change the copy to use `ActionsArtifact.StoragePath` instead of the `ArtifactPath`. Skip artifacts that are expired, and don't error if the file to copy does not exist. --- When trying to migrate actions artifact storage from local to MinIO, we encountered errors that prevented the process from completing successfully: * The migration tries to copy the files using the per-run `ArtifactPath`, instead of the unique `StoragePath`. * Artifacts that have been marked expired and had their files deleted would throw an error * Artifacts that are pending, but don't have a file uploaded yet will throw an error. This PR addresses these cases, and allow the process to complete successfully.
1 parent 8162222 commit 8de8972

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

cmd/migrate_storage.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ package cmd
55

66
import (
77
"context"
8+
"errors"
89
"fmt"
10+
"io/fs"
911
"strings"
1012

1113
actions_model "code.gitea.io/gitea/models/actions"
@@ -194,8 +196,20 @@ func migrateActionsLog(ctx context.Context, dstStorage storage.ObjectStorage) er
194196

195197
func migrateActionsArtifacts(ctx context.Context, dstStorage storage.ObjectStorage) error {
196198
return db.Iterate(ctx, nil, func(ctx context.Context, artifact *actions_model.ActionArtifact) error {
197-
_, err := storage.Copy(dstStorage, artifact.ArtifactPath, storage.ActionsArtifacts, artifact.ArtifactPath)
198-
return err
199+
if artifact.Status == int64(actions_model.ArtifactStatusExpired) {
200+
return nil
201+
}
202+
203+
_, err := storage.Copy(dstStorage, artifact.StoragePath, storage.ActionsArtifacts, artifact.StoragePath)
204+
if err != nil {
205+
// ignore files that do not exist
206+
if errors.Is(err, fs.ErrNotExist) {
207+
return nil
208+
}
209+
return err
210+
}
211+
212+
return nil
199213
})
200214
}
201215

0 commit comments

Comments
 (0)