Skip to content

Register imagePullThroughput and count with MiB#8337

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
keloyang:imagePullThroughput
May 2, 2023
Merged

Register imagePullThroughput and count with MiB#8337
dmcgowan merged 1 commit intocontainerd:mainfrom
keloyang:imagePullThroughput

Conversation

@keloyang
Copy link
Copy Markdown
Contributor

No description provided.

@k8s-ci-robot
Copy link
Copy Markdown

Hi @keloyang. 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.

@Iceber
Copy link
Copy Markdown
Member

Iceber commented Mar 31, 2023

lgtm, cri/sbserver also needs to be modified. https://github.com/containerd/containerd/blob/main/pkg/cri/sbserver/metrics.go

/cc @pacoxu

@k8s-ci-robot
Copy link
Copy Markdown

@Iceber: GitHub didn't allow me to request PR reviews from the following users: pacoxu.

Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

you also need to modify the cri/sbserver https://github.com/containerd/containerd/blob/main/pkg/cri/sbserver/metrics.go

/cc @pacoxu

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.

@ruiwen-zhao
Copy link
Copy Markdown
Member

ruiwen-zhao commented Mar 31, 2023

since we are on this, should we update the comment here to something like "image size in MB / image pull duration in seconds" ?

// pull duration / (image size / 1MBi)
imagePullThroughput prom.Histogram

otherwise /lgtm

@pacoxu
Copy link
Copy Markdown
Contributor

pacoxu commented Apr 3, 2023

It was added in #7313 and probably, and we should cherry-pick it to 1.7.

@keloyang keloyang force-pushed the imagePullThroughput branch 2 times, most recently from 1bd0a36 to 6c5caa2 Compare April 3, 2023 02:14
@keloyang
Copy link
Copy Markdown
Contributor Author

keloyang commented Apr 3, 2023

@Iceber @pacoxu I have added the same change to sbserver and modified the comments. PTAL, thanks for your review.

@keloyang keloyang force-pushed the imagePullThroughput branch from 6c5caa2 to b3d0528 Compare April 3, 2023 02:48
@keloyang keloyang force-pushed the imagePullThroughput branch from b3d0528 to 02d94ca Compare April 3, 2023 05:11
@keloyang keloyang force-pushed the imagePullThroughput branch from 02d94ca to c3ba864 Compare April 3, 2023 06:31
@keloyang keloyang requested review from Iceber and pacoxu April 3, 2023 10:02
Copy link
Copy Markdown
Contributor

@pacoxu pacoxu left a comment

Choose a reason for hiding this comment

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

https://github.com/containerd/containerd/actions/runs/4593622478/jobs/8111799493?pr=8337#step:15:43 the CI failure seems to be unrelated.

=== FAIL: . TestRestartMonitor/Failure_Policy (0.13s)
    log_hook.go:47: time="2023-04-03T06:50:38.475123116Z" level=debug msg="remote introspection plugin filters" func="introspection.(*introspectionRemote).Plugins" file="/home/runner/work/containerd/containerd/services/introspection/introspection.go:46" filters="[type==io.containerd.snapshotter.v1, id==overlayfs]" testcase=TestRestartMonitor/Failure_Policy
    restart_monitor_test.go:420: expected restart count to be 1, got 0
    --- FAIL: TestRestartMonitor/Failure_Policy (0.13s)

@keloyang keloyang force-pushed the imagePullThroughput branch from c3ba864 to 3eab039 Compare April 3, 2023 11:10
@keloyang keloyang requested a review from pacoxu April 6, 2023 02:13
@keloyang
Copy link
Copy Markdown
Contributor Author

keloyang commented Apr 6, 2023

ping @Iceber @pacoxu PTAL.

@pacoxu
Copy link
Copy Markdown
Contributor

pacoxu commented Apr 6, 2023

/lgtm
/cc @samuelkarp @ruiwen-zhao

@k8s-ci-robot k8s-ci-robot requested a review from samuelkarp April 6, 2023 02:35
@k8s-ci-robot
Copy link
Copy Markdown

@pacoxu: GitHub didn't allow me to request PR reviews from the following users: ruiwen-zhao.

Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

/lgtm
/cc @samuelkarp @ruiwen-zhao

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.

Signed-off-by: Shukui Yang <yangshukui@bytedance.com>
@keloyang keloyang force-pushed the imagePullThroughput branch from 3eab039 to db22327 Compare April 7, 2023 02:12
@keloyang keloyang requested a review from Iceber April 7, 2023 02:17
Copy link
Copy Markdown
Member

@Iceber Iceber left a comment

Choose a reason for hiding this comment

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

LGTM

@keloyang
Copy link
Copy Markdown
Contributor Author

ping @pacoxu @samuelkarp PTAL, thanks.

@pacoxu
Copy link
Copy Markdown
Contributor

pacoxu commented Apr 10, 2023

Thanks, @keloyang for fixing my mistake in last pr #7313 that is imagePullThroughput metrics is not registered.
/cc @fuweid

And we should cherry-pick it to 1.7.

@k8s-ci-robot k8s-ci-robot requested a review from fuweid April 10, 2023 02:13
Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Apr 11, 2023
@dmcgowan dmcgowan merged commit a7ceac8 into containerd:main May 2, 2023
@ialidzhikov
Copy link
Copy Markdown

And we should cherry-pick it to 1.7.

I don't see this PR cherry-picked to the release-1.7 branch..

@ialidzhikov
Copy link
Copy Markdown

/cherry-pick release/1.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@ialidzhikov: only containerd org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

Details

In response to this:

/cherry-pick release/1.7

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.

@ialidzhikov
Copy link
Copy Markdown

Hi folks,

I now created a manual cherry-pick: #9855.
Could you please help getting it in?

@austinvazquez austinvazquez added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch needs-ok-to-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.