Skip to content

internal/safepath: log some unhandled errors, and remove workaround for ECI / Sysbox#48774

Merged
thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah:safepath_nits
Oct 28, 2024
Merged

internal/safepath: log some unhandled errors, and remove workaround for ECI / Sysbox#48774
thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah:safepath_nits

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

internal/safepath: kubernetesSafeOpen: explicitly suppress unhandled err

internal/safepath: Join(): log some unhandled errors

Similar to the kubernetesSafeOpen function.

internal/safepath: Join(): remove workaround for ECI / Sysbox

This workaround was added in 9a0cde6 to
work around an issue on Docker Desktop with ECI (Enhanced Container Isolation)
enabled, which uses the Sysbox runtime under the hood.

A comment was added during review of the PR that added it (see 1), and the
internal discussion on Slack tracked down the issue to code in nestybox/sysfs.

That issue was resolved Sysbox EE, and upstreamed to Sysbox CE through
nestybox/sysbox-fs@9cf74e4, which is part of Sysbox CE v0.6.3, so we
can remove this workaround.

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Similar to the kubernetesSafeOpen function.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
This workaround was added in 9a0cde6 to
work around an issue on Docker Desktop with ECI (Enhanced Container Isolation)
enabled, which uses the Sysbox runtime under the hood.

A comment was added during review of the PR that added it (see [1]), and the
internal discussion on Slack tracked down the issue to code in [nestybox/sysfs].

That issue was resolved Sysbox EE, and upstreamed to Sysbox CE through
[nestybox/sysbox-fs@9cf74e4], which is part of Sysbox CE v0.6.3, so we
can remove this workaround.

[1]: moby#45687 (comment)
[nestybox/sysfs]: https://github.com/nestybox/sysbox-fs/blob/30fd49edbd51048fed8b2ad0af327598d30b29eb/process/process.go#L644-L684
[nestybox/sysbox-fs@9cf74e4]: nestybox/sysbox-fs@9cf74e4

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added status/2-code-review area/volumes Volumes kind/refactor PR's that refactor, or clean-up code labels Oct 27, 2024
@thaJeztah thaJeztah added this to the 28.0.0 milestone Oct 27, 2024
@thaJeztah thaJeztah requested a review from vvoland October 27, 2024 12:14
@thaJeztah thaJeztah self-assigned this Oct 27, 2024
@thaJeztah thaJeztah merged commit 61433c2 into moby:master Oct 28, 2024
@thaJeztah thaJeztah deleted the safepath_nits branch October 28, 2024 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/volumes Volumes kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants