Skip to content

avoid adding io_serviced and io_service_bytes duplicately#93

Merged
fuweid merged 1 commit intocontainerd:masterfrom
sofat1989:master
Jul 17, 2019
Merged

avoid adding io_serviced and io_service_bytes duplicately#93
fuweid merged 1 commit intocontainerd:masterfrom
sofat1989:master

Conversation

@sofat1989
Copy link

@sofat1989 sofat1989 commented Jul 15, 2019

@sofat1989 sofat1989 mentioned this pull request Jul 15, 2019
Closed
@fuweid
Copy link
Member

fuweid commented Jul 15, 2019

Thanks @sofat1989. But you need to sign it off. git commit -s --amend might help :)

@codecov-io
Copy link

codecov-io commented Jul 16, 2019 •
edited
Loading

Codecov Report

Merging #93 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #93      +/-   ##
==========================================
- Coverage   14.05%   14.05%   -0.01%     
==========================================
  Files          24       24              
  Lines        4910     4911       +1     
==========================================
  Hits          690      690              
- Misses       4096     4097       +1     
  Partials      124      124
Impacted Files Coverage Δ
blkio.go 20.67% <0%> (-0.1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d596c78...f627015. Read the comment docs.

@crosbymichael
Copy link
Member

crosbymichael commented Jul 16, 2019

LGTM

fuweid
fuweid reviewed Jul 17, 2019
View reviewed changes
Copy link
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 merged commit c4b9ac5 into containerd:master Jul 17, 2019
@thaJeztah thaJeztah mentioned this pull request Aug 9, 2019
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Aug 26, 2019
@thaJeztah
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
34776dd 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
dmcgowan pushed a commit to thaJeztah/docker that referenced this pull request Oct 4, 2019
@thaJeztah @dmcgowan
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
0af1099 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Oct 8, 2019
@thaJeztah @dmcgowan
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
e7bc772 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: 0af1099a81861dd0269adad53bdfb387b5c78f39
Component: engine
burnMyDread pushed a commit to burnMyDread/moby that referenced this pull request Oct 21, 2019
@thaJeztah @burnMyDread
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
641835a 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: zach <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Dec 3, 2019
@thaJeztah
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
fe00613 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0af1099)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 23, 2020
@thaJeztah
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
c8bfd0a 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0af1099a81861dd0269adad53bdfb387b5c78f39)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: fe00613d0686a47519048a190f1138504a2cdedc
Component: engine
@lbernail
Copy link

lbernail commented Feb 5, 2020

@thaJeztah we are impacted by the issue in containerd 1.2. Any reason not to backport the patch there? Happy to do it if you think it makes sense

@thaJeztah thaJeztah mentioned this pull request Feb 5, 2020
Merged
@thaJeztah thaJeztah mentioned this pull request Feb 18, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fuweid fuweid fuweid left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

5 participants

@sofat1989 @fuweid @codecov-io @crosbymichael @lbernail