Skip to content

Fix missing Close when error occurs and abused connection pool #35658

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
Merged
merged 5 commits into from
Oct 15, 2025
Merged

Fix missing Close when error occurs and abused connection pool #35658

merged 5 commits into from
Oct 15, 2025

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Oct 14, 2025 •
edited
Loading

Fix #35649

  • Use upstream git-lfs-transfer
  • The Close should be called when error occurs (bug fix)
  • The connection pool should be shared (bug fix)
  • Add more tests to cover "LFS over SSH download"

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 14, 2025
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/dependencies labels Oct 14, 2025
@wxiaoguang

This comment was marked as outdated.

Sign in to view
@wxiaoguang wxiaoguang mentioned this pull request Oct 14, 2025
Merged
@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Oct 14, 2025
@wxiaoguang wxiaoguang mentioned this pull request Oct 14, 2025
Closed
@wxiaoguang wxiaoguang changed the title LFS SSH: Fix missing Close when error occurs and add more tests Fix missing Close when error occurs and abused connection pool Oct 15, 2025
@wxiaoguang wxiaoguang marked this pull request as draft October 15, 2025 02:41
@wxiaoguang wxiaoguang marked this pull request as ready for review October 15, 2025 03:37
@wxiaoguang wxiaoguang mentioned this pull request Oct 15, 2025
Merged
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels Oct 15, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 15, 2025
lunny
lunny reviewed Oct 15, 2025
View reviewed changes
go.mod

replace github.com/nektos/act => gitea.com/gitea/act v0.261.7-0.20251003180512-ac6e4b751763

// TODO: the only difference is in `PutObject`: the fork doesn't use `NewVerifyingReader(r, sha256.New(), oid, expectedSize)`, need to figure out why
Copy link
Member

Choose a reason for hiding this comment

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

Is it safe to stop using the fork now?

Copy link
Contributor Author

@wxiaoguang wxiaoguang Oct 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I think yes, the fork is unmaintained, NewVerifyingReader is standard LFS operation.

@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 Oct 15, 2025
@wxiaoguang wxiaoguang enabled auto-merge (squash) October 15, 2025 09:36
@wxiaoguang wxiaoguang merged commit c55a017 into go-gitea:main Oct 15, 2025
26 checks passed
@wxiaoguang wxiaoguang deleted the fix-lfs-ssh branch October 15, 2025 09:47
wxiaoguang added a commit that referenced this pull request Oct 15, 2025
@wxiaoguang
Fix missing Close when error occurs and abused connection pool (#35658)…
53a2aae 
… (#35670)

Backport #35658
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 16, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
c2a80d6 
* giteaofficial/main:
  Bump happy-dom from 20.0.0 to 20.0.2 (go-gitea#35677)
  Fix missing Close when error occurs and abused connection pool (go-gitea#35658)
  Upgrade to go 1.25.3 (go-gitea#35656)
  Always create Actions logs stepsContainer (go-gitea#35654)
  Fix a bug missed return (go-gitea#35655)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies modifies/go Pull requests that update Go code type/bug

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

During git clone, gitea fails with accept4: too many open files; retrying in 1s

4 participants

@wxiaoguang @lunny @silverwind @GiteaBot