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

[20.10 backport] Merge fixes to pkg/system to support FreeBSD's mknod #43686

Merged
merged 2 commits into from Jun 3, 2022

Conversation

dfr
Copy link

@dfr dfr commented Jun 3, 2022

backports:

This allows projects that depend on pkg/system's implementation of mknod such as github.com/openshift/imagebuilder and github.com/containers/buildah to build on FreeBSD.

@thaJeztah
Copy link
Member

thaJeztah commented Jun 3, 2022

Thanks! Overall this looks harmless to backport, so I'm ok with this; could you perhaps amend the commits, and sign-off the commits with your own DCO sign-off as well? i.e.,

Signed-off-by: Original Author <email>
(cherry picked from commit XXX)
Signed-off-by: Your Name <your e-mail>

@thaJeztah thaJeztah added this to the 20.10.17 milestone Jun 3, 2022
akhramov and others added 2 commits Jun 3, 2022
Because FreeBSD uses 64-bit device nodes (see
https://reviews.freebsd.org/rS318736), Linux implementation of
`system.Mknod` & `system.Mkdev` is not sufficient.

This change adds freebsd-specific implementations for `Mknod` and
Mkdev`.

Signed-off-by: Artem Khramov <akhramov@pm.me>
(cherry picked from commit f3d3994)
Signed-off-by: Doug Rabson <dfr@rabson.org>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 26dafe4)
Signed-off-by: Doug Rabson <dfr@rabson.org>
@dfr dfr force-pushed the backport-freebsd-mknod branch from fb81056 to f55b030 Compare Jun 3, 2022
@dfr
Copy link
Author

dfr commented Jun 3, 2022

I've added my own sign-off - I wasn't sure about that part since I'm not really adding much value here :). Thanks for the feedback.

@thaJeztah
Copy link
Member

thaJeztah commented Jun 3, 2022

Thanks! Yes, it's a bit of a "grey" area. I know a previous check we had would fail if the sign-off wasn't the last line in the commit message, and IANAL, so just in case ❤️

Copy link
Member

@thaJeztah thaJeztah left a comment

LGTM

@samuelkarp ptal

@dfr
Copy link
Author

dfr commented Jun 3, 2022

The test failure looks like this:

[2022-06-03T11:32:37.098Z] === FAIL: amd64.integration-cli TestDockerSwarmSuite/TestSwarmContainerEndpointOptions (2.17s)
[2022-06-03T11:32:37.098Z]     docker_cli_swarm_test.go:351: assertion failed: error is not nil: exit status 125: Unable to find image 'busybox:glibc' locally
[2022-06-03T11:32:37.098Z]         /usr/local/cli/docker: Error response from daemon: toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit.
[2022-06-03T11:32:37.098Z]         See '/usr/local/cli/docker run --help'.
[2022-06-03T11:32:37.098Z]         
[2022-06-03T11:32:37.098Z]     --- FAIL: TestDockerSwarmSuite/TestSwarmContainerEndpointOptions (2.17s)

which seems unrelated to the changes in this PR

@thaJeztah
Copy link
Member

thaJeztah commented Jun 3, 2022

Ah! I'll kick CI again; have been spamming the machines a bit with rebuild requests, and we don't set authentication on them, so at times we hit the rate limits on those machines

@dfr
Copy link
Author

dfr commented Jun 3, 2022

Looks to be the same overload issue:


[2022-06-03T13:06:40.172Z] === Failed
[2022-06-03T13:06:40.172Z] === FAIL: amd64.integration-cli TestDockerSwarmSuite/TestSwarmContainerEndpointOptions (2.20s)
[2022-06-03T13:06:40.172Z]     docker_cli_swarm_test.go:351: assertion failed: error is not nil: exit status 125: Unable to find image 'busybox:glibc' locally
[2022-06-03T13:06:40.172Z]         /usr/local/cli/docker: Error response from daemon: toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit.
[2022-06-03T13:06:40.172Z]         See '/usr/local/cli/docker run --help'.
[2022-06-03T13:06:40.172Z]         
[2022-06-03T13:06:40.172Z]     --- FAIL: TestDockerSwarmSuite/TestSwarmContainerEndpointOptions (2.20s)

tianon
tianon approved these changes Jun 3, 2022
@thaJeztah
Copy link
Member

thaJeztah commented Jun 3, 2022

Looks like you hit the jackpot; now a flaky test 😂 (I kicked it once more)

@tianon tianon merged commit 59d0ff3 into moby:20.10 Jun 3, 2022
2 checks passed
@dfr
Copy link
Author

dfr commented Jun 4, 2022

Thanks for the quick turnaround!

@dfr dfr deleted the backport-freebsd-mknod branch Jun 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants