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

Cherry-pick #8126 to 6.x: Add docker diskio stats on Windows #8134

Merged
merged 1 commit into from
Aug 29, 2018

Conversation

jsoriano
Copy link
Member

Cherry-pick of PR #8126 to 6.x branch. Original message:

Docker stats use a different data structure for blkio stats in Windows, the main difference is that in posix systems (Linux at least) stats are separated by device by Major/Minor (lists of BlkioStatsEntry), and in Windows they are directly summarized by reads and writes, by operations and volume (StorageStats).

This change counts the metrics of both data structures and aggregates the result.

Fixes #6815

Docker stats use a different data structure for blkio stats in Windows, the main difference is that in posix systems (Linux at least) stats are separated by device by Major/Minor (lists of BlkioStatsEntry), and in Windows they are directly summarized by reads and writes, by operations and volume (StorageStats).

This change counts the metrics of both data structures and aggregates the result.

Fixes elastic#6815

(cherry picked from commit 63f25a4)
@jsoriano
Copy link
Member Author

jsoriano commented Aug 29, 2018

Test failure is not related, merging this.

@jsoriano jsoriano merged commit bde8b84 into elastic:6.x Aug 29, 2018
@jsoriano jsoriano deleted the backport_8126_6.x branch August 29, 2018 10:40
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.

2 participants