Skip to content

Fix missing Body.Close() calls on push to docker remote#5712

Merged
estesp merged 1 commit intocontainerd:mainfrom
coryb:docker-push-close-body
Jul 12, 2021
Merged

Fix missing Body.Close() calls on push to docker remote#5712
estesp merged 1 commit intocontainerd:mainfrom
coryb:docker-push-close-body

Conversation

@coryb
Copy link
Copy Markdown
Contributor

@coryb coryb commented Jul 11, 2021

Discovered this while using HTTP tracing via OpenTelemetry inside of
buildkitd, where the trace spans were not being reported for the
registry PUT http requests. The spans are only reported on the Close
for the Body, after adding these Close calls, the spans are reported as
expected.

related buildkit code

cc @tonistiigi

@k8s-ci-robot
Copy link
Copy Markdown

Hi @coryb. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jul 11, 2021

Build succeeded.

@coryb coryb force-pushed the docker-push-close-body branch from 0db7e6d to 2d4261c Compare July 11, 2021 15:09
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jul 11, 2021

Build succeeded.

Discovered this while using HTTP tracing via OpenTelemetry inside of
buildkitd, where the trace spans were not being reported for the
registry PUT http requests.  The spans are only reported on the Close
for the Body, after adding these Close calls, the spans are reported as
expected.

Signed-off-by: coryb <cbennett@netflix.com>
@coryb coryb force-pushed the docker-push-close-body branch from 2d4261c to 894b6ae Compare July 11, 2021 15:15
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jul 11, 2021

Build succeeded.

@wangxiyuan
Copy link
Copy Markdown

recheck

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jul 12, 2021

Build succeeded.

@tonistiigi
Copy link
Copy Markdown
Member

@coryb Do you think this could be the issue in moby/buildkit#1988 (comment) or should the pool still be released internally for this case.

@coryb
Copy link
Copy Markdown
Contributor Author

coryb commented Jul 12, 2021

@tonistiigi not sure, suppose it is possibly related. I don't have any data on pushes hanging, or at least we have not been running with the tracing enabled long enough to diagnose any on our side. I didn't see any delays in my testing on this specific issue anyway.

@tonistiigi
Copy link
Copy Markdown
Member

@coryb Even if related it can't happen atm as the PR was reverted. But something deadlocked for some people
after https://github.com/moby/buildkit/pull/1986/files is applied.

@thaJeztah
Copy link
Copy Markdown
Member

/ok-to-test

@thaJeztah
Copy link
Copy Markdown
Member

@AkihiroSuda could you "approve" the workflow to trigger CI?

Copy link
Copy Markdown
Member

@kzys kzys left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@containerd/committers Can someone take a look?

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

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.

7 participants