Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Retry rename on lock induced failures (re-fix) (#16461) #16463

Merged
merged 1 commit into from
Jul 16, 2021
Merged

Retry rename on lock induced failures (re-fix) (#16461) #16463

merged 1 commit into from
Jul 16, 2021

Conversation

zeripath
Copy link
Contributor

Backport #16461

Unfortunately #16435 asserts the wrong error and should use
os.LinkError not os.PathError.

Fix #16439

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath
Retry rename on lock induced failures (re-fix) (go-gitea#16461)
9cc54da 
Backport go-gitea#16461

Unfortunately go-gitea#16435 asserts the wrong error and should use
os.LinkError not os.PathError.

Fix go-gitea#16439

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.14.5 milestone Jul 16, 2021
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 16, 2021
@zeripath zeripath mentioned this pull request Jul 16, 2021
Merged
@zeripath
Copy link
Contributor Author

Windows users it would be very helpful if you could test this. If you cannot build this:

https://www.eldritchkitty.com/~andrew/gitea-1.14.5-16463-windows-4.0-amd64.exe is a windows build of 1.14 with #16463 compiled in.

https://www.eldritchkitty.com/~andrew/gitea-1.14.5-16463-windows-4.0-amd64.exe.asc is the gpg signature signed by my key if you want to assert that this from me.

@zeripath
Copy link
Contributor Author

@onlygecko @julian-go

@julian-go
Copy link

Earliest I can test this is on Monday.

@zeripath
Copy link
Contributor Author

zeripath commented Jul 16, 2021 •
edited
Loading

OK well I think we can just merge #16461, #16462, and #16463 because looking at the code for os.Rename - it's clear that it always returns os.LinkError not os.PathError and #16435 and its backport is just wrong.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 16, 2021
@zeripath zeripath merged commit e6c2225 into go-gitea:release/v1.14 Jul 16, 2021
@zeripath zeripath deleted the backport-16461-v1.14 branch July 16, 2021 16:48
@zeripath zeripath mentioned this pull request Jul 18, 2021
Closed
6 tasks
@zeripath
Copy link
Contributor Author

OK look like this isn't enough see: #16481

@zeripath zeripath mentioned this pull request Aug 1, 2021
Closed
6 tasks
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@KN4CK3R KN4CK3R KN4CK3R approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.14.5
Development

Successfully merging this pull request may close these issues.
5 participants
@zeripath @julian-go @lafriks @KN4CK3R @GiteaBot