Skip to content

Skip failed LFS objects and continue when migrating LFS #31623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from

Conversation

wolfogre
Copy link
Member

@wolfogre wolfogre commented Jul 12, 2024

Partially fix #31137.

When migrating LFS objects, if there's any object that failed (like some objects are losted, which is not really critical), Gitea will stop migrating LFS immediately but treat the migration as successful.

This PR makes it ignore failed objects and continue migrating. It may not be the best way to handle it, but a better way.

And to ensure data integrity of LFS objects, we may need to add an option to fail the migration if there's any error in the feature.

@wolfogre wolfogre added type/bug topic/lfs backport/v1.22 This PR should be backported to Gitea 1.22 labels Jul 12, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 12, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jul 12, 2024
@wolfogre wolfogre changed the title fix: ignore failed LFS objects Skip failed LFS objects and continue when migrating LFS Jul 12, 2024
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would create an dedicated error where you can errors.Is check against ...

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 12, 2024
@6543
Copy link
Member

6543 commented Jul 12, 2024

... so if repo_module.StoreMissingLfsObjectsInRepository is reused at other code parts we do handle this ... and only skip by case in the migrator

@wolfogre
Copy link
Member Author

@6543

I would create an dedicated error where you can errors.Is check against ...

A dedicated error to indicate "Not found" can help only when we can choose to "ignore and continue" or "stop and fail".
However, there are only "ignore and continue" or "stop and mark success", that's why I added the comment TODO: Optionally return error to ensure data integrity of LFS objects.

So I don't think it makes sense to block this PR. We should merge this first and focus on TODO: Optionally return error to ensure data integrity of LFS objects.

@6543
Copy link
Member

6543 commented Jul 23, 2024

I still think it should be fixed in this pull

@wolfogre
Copy link
Member Author

I still think it should be fixed in this pull

@6543 I understand you think this PR doesn't fix it completely (I agree with that so it's "Partially fix"), but it at least it doesn't makes things worse. And the introduced TODO comments indicate what we should do next.


By the way, you said "I would create an dedicated error ...", I'm not sure whether you mean you will do this or you suggest me to do this?

I thought it was "(If I have time) I would..." so I waited for two weeks. But I just noticed that it could be "(If I were you) I would...", so we need to clarify it. 😄 Never mind, It's just a friendly discussion about English studying between two non-native English speakers.

If you suggest me to do this, I would say I already tried, but it need more work since we cannot check the error just from the message, it need follow the spec to differentiate error types, but Gitea misses it in LFS. So I chose to add the TODO and finish it in another PR.

@6543
Copy link
Member

6543 commented Jul 24, 2024

I added the errors here: #31697

@6543
Copy link
Member

6543 commented Jul 24, 2024

ok pushing to your branch was not intendet ... well @wolfogre either keep this pull and close mine or reverte my changes on your pull if you are not ok with it etc ...

@wolfogre
Copy link
Member Author

Close it since #31702 finished the work.

@wolfogre wolfogre closed this Jul 25, 2024
wolfogre added a commit that referenced this pull request Jul 31, 2024
…ion (#31702)

Fix #31137.

Replace #31623 #31697.

When migrating LFS objects, if there's any object that failed (like some
objects are losted, which is not really critical), Gitea will stop
migrating LFS immediately but treat the migration as successful.

This PR checks the error according to the [LFS api
doc](https://github.com/git-lfs/git-lfs/blob/main/docs/api/batch.md#successful-responses).

> LFS object error codes should match HTTP status codes where possible:
> 
> - 404 - The object does not exist on the server.
> - 409 - The specified hash algorithm disagrees with the server's
acceptable options.
> - 410 - The object was removed by the owner.
> - 422 - Validation error.

If the error is `404`, it's safe to ignore it and continue migration.
Otherwise, stop the migration and mark it as failed to ensure data
integrity of LFS objects.

And maybe we should also ignore others errors (maybe `410`? I'm not sure
what's the difference between "does not exist" and "removed by the
owner".), we can add it later when some users report that they have
failed to migrate LFS because of an error which should be ignored.
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jul 31, 2024
…ion (go-gitea#31702)

Fix go-gitea#31137.

Replace go-gitea#31623 go-gitea#31697.

When migrating LFS objects, if there's any object that failed (like some
objects are losted, which is not really critical), Gitea will stop
migrating LFS immediately but treat the migration as successful.

This PR checks the error according to the [LFS api
doc](https://github.com/git-lfs/git-lfs/blob/main/docs/api/batch.md#successful-responses).

> LFS object error codes should match HTTP status codes where possible:
> 
> - 404 - The object does not exist on the server.
> - 409 - The specified hash algorithm disagrees with the server's
acceptable options.
> - 410 - The object was removed by the owner.
> - 422 - Validation error.

If the error is `404`, it's safe to ignore it and continue migration.
Otherwise, stop the migration and mark it as failed to ensure data
integrity of LFS objects.

And maybe we should also ignore others errors (maybe `410`? I'm not sure
what's the difference between "does not exist" and "removed by the
owner".), we can add it later when some users report that they have
failed to migrate LFS because of an error which should be ignored.
lunny pushed a commit that referenced this pull request Jul 31, 2024
…ion (#31702) (#31745)

Backport #31702 by @wolfogre

Fix #31137.

Replace #31623 #31697.

When migrating LFS objects, if there's any object that failed (like some
objects are losted, which is not really critical), Gitea will stop
migrating LFS immediately but treat the migration as successful.

This PR checks the error according to the [LFS api
doc](https://github.com/git-lfs/git-lfs/blob/main/docs/api/batch.md#successful-responses).

> LFS object error codes should match HTTP status codes where possible:
> 
> - 404 - The object does not exist on the server.
> - 409 - The specified hash algorithm disagrees with the server's
acceptable options.
> - 410 - The object was removed by the owner.
> - 422 - Validation error.

If the error is `404`, it's safe to ignore it and continue migration.
Otherwise, stop the migration and mark it as failed to ensure data
integrity of LFS objects.

And maybe we should also ignore others errors (maybe `410`? I'm not sure
what's the difference between "does not exist" and "removed by the
owner".), we can add it later when some users report that they have
failed to migrate LFS because of an error which should be ignored.

Co-authored-by: Jason Song <[email protected]>
@lunny lunny removed the backport/v1.22 This PR should be backported to Gitea 1.22 label Aug 2, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged modifies/go Pull requests that update Go code topic/lfs type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrating repo with LFS causes 500 error
4 participants