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

Windows: Minimal docker top implementation #21354

Merged
merged 1 commit into from
Mar 22, 2016
Merged

Conversation

lowenna
Copy link
Member

@lowenna lowenna commented Mar 20, 2016

Signed-off-by: John Howard jhoward@microsoft.com

This needs platform support to get rich information like is returned on Linux, but at least it's better than returning an error not supported on Windows. While I was there, although not used on Windows, I also implemented GetPidsForContainer in libcontainerd - that is the function Linux uses to support docker top.

image

Signed-off-by: John Howard <jhoward@microsoft.com>
@thaJeztah
Copy link
Member

Flaky test on gccgo? https://jenkins.dockerproject.org/job/Docker-PRs-gccgo/3540/console

01:19:42 PASS: docker_cli_run_test.go:3905: TestRunStdinBlockedAfterContainerExit.pN52_github_com_docker_docker_integration_cli.DockerSuite 1.469s
01:19:45 
01:19:45 ----------------------------------------------------------------------
01:19:45 FAIL: docker_cli_run_test.go:88: TestRunStdinPipe.pN52_github_com_docker_docker_integration_cli.DockerSuite
01:19:45 
01:19:45 docker_cli_run_test.go:105:
01:19:45     c.Errorf("logs didn't print the container's logs %s", containerLogs)
01:19:45 ... Error: logs didn't print the container's logs 
01:19:45 
01:19:46 
01:19:46 ----------------------------------------------------------------------

@vdemeester
Copy link
Member

@thaJeztah got the same on another PR 😱

@thaJeztah
Copy link
Member

opened an issue for that test #21365

@calavera
Copy link
Contributor

Very cool. LGTM

@vdemeester
Copy link
Member

LGTM 🐮
@jhowardmsft small screenshot ? 😸

@lowenna
Copy link
Member Author

lowenna commented Mar 22, 2016

@vdemeester Here you go. I did say minimal 😈

image

calavera added a commit that referenced this pull request Mar 22, 2016
Windows: Minimal docker top implementation
@calavera calavera merged commit adc6ed5 into moby:master Mar 22, 2016
@lowenna lowenna deleted the jjh/getpids branch March 22, 2016 03:55
@vdemeester
Copy link
Member

@jhowardmsft yay ❤️

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.

5 participants