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.

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

fix: revert: set rlimit explicitly in wrapperd #7208

Merged
merged 1 commit into from
May 11, 2023

Conversation

frezbo
Copy link
Member

@frezbo frezbo commented May 11, 2023

This reverts commit a2565f6.

The fix done in a2565f67, was actually a no-op caused by the misunderstanding the fix done in Go and backported to Go 1.20.4. The fix gave a false confidence that it was working when it was tested against Talos main branch since the PR #7190 bumped x/sys package from v0.7.0 -> v0.8.0, the actual change in x/sys can be found here at https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c which meant that when updating Go to 1.20.4 the x/sys package should been updated too. The x/sys package changed how the syscall to set the rlimit was called, it got moved into the Go stdlib instead of calling rlimit syscall in the x/sys package, which meant a combination of using Go 1.20.4 and an older x/sys package means RLIMIT_NOFILE value would not be set back to the original value.

The Talos 1.4 release branch currently have x/sys at [v0.7.0(https://github.com/siderolabs/talos/blob/v1.4.3/go.mod#L133), so the backport would consist of this change along another commit bumping x/sys package to v0.8.0.

Fixes: #7198
Fixes: #7206

@frezbo frezbo force-pushed the fix/rlimit-nofile branch from d6df763 to d12e3c2 Compare May 11, 2023 18:07
@frezbo frezbo changed the title Revert "fix: set rlimit explicitly in wrapperd" fix: revert: set rlimit explicitly in wrapperd May 11, 2023
This reverts commit a2565f6.

The fix done in `a2565f67`, was actually a no-op caused by the
misunderstanding the fix done in Go and backported to [Go 1.20.4](golang/go@ecf7e00).
The fix gave a false confidence that it was working when it was tested
against Talos `main` branch since the PR siderolabs#7190 bumped `x/sys` package
from [v0.7.0 -> v0.8.0](golang/go@ecf7e00), the actual change in `x/sys` can be found here at https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c which meant that when updating Go to 1.20.4 the `x/sys` package should been updated too. The `x/sys` package changed how the syscall to set the rlimit was called, it got moved into the Go stdlib instead of calling rlimit syscall in the `x/sys` package, which meant a combination of using Go 1.20.4 and an older `x/sys` package means `RLIMIT_NOFILE` value would not be set back to the original value.

The Talos 1.4 release branch currently have  `x/sys`
at [v0.7.0(https://github.com/siderolabs/talos/blob/v1.4.3/go.mod#L133),
so the backport would consist of this change along another commit bumping `x/sys` package to `v0.8.0`.

Fixes: siderolabs#7198
Fixes: siderolabs#7206

Co-authored-by: Utku Ozdemir <utku.ozdemir@siderolabs.com>
Signed-off-by: Noel Georgi <git@frezbo.dev>
@frezbo frezbo force-pushed the fix/rlimit-nofile branch from d12e3c2 to 4f720d4 Compare May 11, 2023 18:09
@frezbo
Copy link
Member Author

frezbo commented May 11, 2023

/m

@talos-bot talos-bot merged commit 4f720d4 into siderolabs:main May 11, 2023
@frezbo frezbo deleted the fix/rlimit-nofile branch May 11, 2023 19:44
frezbo added a commit to frezbo/talos that referenced this pull request May 11, 2023
Bump `x/sys` to v0.8.0 for a complete fix for siderolabs#7208 in the release-1.4
branch. See https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c

Signed-off-by: Noel Georgi <git@frezbo.dev>
@frezbo frezbo mentioned this pull request May 11, 2023
frezbo added a commit to frezbo/talos that referenced this pull request May 11, 2023
Bump `x/sys` to v0.8.0 for a complete fix for siderolabs#7208 in the release-1.4
branch. See https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c

Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo added a commit to frezbo/talos that referenced this pull request May 11, 2023
Bump `x/sys` to v0.8.0 for a complete fix for siderolabs#7208 in the release-1.4
branch. See https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c

Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo added a commit to frezbo/talos that referenced this pull request May 12, 2023
Bump `x/sys` to v0.8.0 for a complete fix for siderolabs#7208 in the release-1.4
branch. See https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c

Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo added a commit to frezbo/talos that referenced this pull request May 12, 2023
Bump `x/sys` to v0.8.0 for a complete fix for siderolabs#7208 in the release-1.4
branch. See https://cs.opensource.google/go/x/sys/+/ff18efa0a3fa22d4fede381b822bbcfe53b7ee7c

Signed-off-by: Noel Georgi <git@frezbo.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants