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.

Sign up for GitHub

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

Jump to bottom

A docker process mapper #62

Merged
merged 1 commit into from
May 20, 2015
Merged

A docker process mapper #62

merged 1 commit into from
May 20, 2015

Conversation

tomwilkie
Copy link
Contributor

Fixes #25

@tomwilkie
Copy link
Contributor Author

This is WIP, but early feedback would be welcome.

tomwilkie
tomwilkie reviewed May 19, 2015
View reviewed changes
probe/docker_process_mapper.go
docker "github.com/fsouza/go-dockerclient"
)

// dockerMapper is a cgroup task mapper.

This comment was marked as abuse.

Sign in to view

@peterbourgon
Copy link
Contributor

The architecture feels like the right way to do it. We should think if we shouldn't allow a single function invocation to annotate a PID with more-than-one piece of data, i.e. change

func Map(pid int) string

to

func Annotate(pid int) map[string]string

but we can do that later.

@tomwilkie tomwilkie force-pushed the docker-process-mapper branch 6 times, most recently from b5f0671 to a51ffb3 Compare May 20, 2015 09:10
@tomwilkie
Copy link
Contributor Author

PTAL; they aren't exposed yet, but @peterbourgon is working on that.

peterbourgon
peterbourgon reviewed May 20, 2015
View reviewed changes
probe/docker_process_mapper.go
}

var newDockerClient = newRealDockerClient
var newPidTreeStub = newPidTree

This comment was marked as abuse.

Sign in to view

@peterbourgon
Copy link
Contributor

...and, in general, s/Pid/PID/g. Otherwise 🍡

@tomwilkie tomwilkie force-pushed the docker-process-mapper branch 2 times, most recently from 0191196 to d736033 Compare May 20, 2015 11:16
tomwilkie added a commit that referenced this pull request May 20, 2015
@tomwilkie
Merge pull request #62 from tomwilkie/docker-process-mapper
4710657 
A docker process mapper
@tomwilkie tomwilkie merged commit 4710657 into weaveworks:master May 20, 2015
@tomwilkie tomwilkie deleted the docker-process-mapper branch May 20, 2015 11:25
2opremio pushed a commit that referenced this pull request Jan 17, 2017
@tomwilkie
Merge pull request #62 from weaveworks/revert-61-test-defaults
2b3a1bb 
Revert "Make no-go-get the default, and don't assume -tags netgo"
iaguis added a commit to kinvolk-archives/scope that referenced this pull request Jan 18, 2017
@iaguis
Squashed 'tools/' changes from 4b7d5c6..f9dcbf6
47eb000 
f9dcbf6 ... without tab (clearly not my day)
a6215c3 Add break I forgot
0e6832d Remove incorrectly added tab
eb26c68 Merge pull request weaveworks#64 from weaveworks/remove-test-package-linting
f088e83 Review feedback
2c6e83e Remove test package linting
2b3a1bb Merge pull request weaveworks#62 from weaveworks/revert-61-test-defaults
8c3883a Revert "Make no-go-get the default, and don't assume -tags netgo"
e75c226 Fix bug in GC of firewall rules.
e49754e Merge pull request weaveworks#51 from weaveworks/gc-firewall-rules
191f487 Add flag to enale/disable firewall rules' GC.
567905c Add GC of firewall rules for weave-net-tests to scheduler.
03119e1 Fix typo in GC of firewall rules.
bbe3844 Fix regular expression for firewall rules.
c5c23ce Pre-change refactoring: splitted gc_project function into smaller methods for better readability.
ed5529f GC firewall rules
ed8e757 Merge pull request weaveworks#61 from weaveworks/test-defaults
57856e6 Merge pull request weaveworks#56 from weaveworks/remove-wcloud
dd5f3e6 Add -p flag to test, run test in parallel
62f6f94 Make no-go-get the default, and don't assume -tags netgo
8946588 Merge pull request weaveworks#60 from weaveworks/2647-gc-weave-net-tests
4085df9 Scheduler now also garbage-collects VMs from weave-net-tests.
d1a5e46 Remove wcloud cli tool

git-subtree-dir: tools
git-subtree-split: f9dcbf6
2opremio pushed a commit that referenced this pull request Jan 19, 2017
Squashed 'tools/' changes from 4b7d5c6..a3b18bf
52d1ae4 
a3b18bf Merge pull request #65 from weaveworks/fix-integration-tests
ecb5602 Fix integration tests
f9dcbf6 ... without tab (clearly not my day)
a6215c3 Add break I forgot
0e6832d Remove incorrectly added tab
eb26c68 Merge pull request #64 from weaveworks/remove-test-package-linting
f088e83 Review feedback
2c6e83e Remove test package linting
2b3a1bb Merge pull request #62 from weaveworks/revert-61-test-defaults
8c3883a Revert "Make no-go-get the default, and don't assume -tags netgo"
e75c226 Fix bug in GC of firewall rules.
e49754e Merge pull request #51 from weaveworks/gc-firewall-rules
191f487 Add flag to enale/disable firewall rules' GC.
567905c Add GC of firewall rules for weave-net-tests to scheduler.
03119e1 Fix typo in GC of firewall rules.
bbe3844 Fix regular expression for firewall rules.
c5c23ce Pre-change refactoring: splitted gc_project function into smaller methods for better readability.
ed5529f GC firewall rules
ed8e757 Merge pull request #61 from weaveworks/test-defaults
57856e6 Merge pull request #56 from weaveworks/remove-wcloud
dd5f3e6 Add -p flag to test, run test in parallel
62f6f94 Make no-go-get the default, and don't assume -tags netgo
8946588 Merge pull request #60 from weaveworks/2647-gc-weave-net-tests
4085df9 Scheduler now also garbage-collects VMs from weave-net-tests.
d1a5e46 Remove wcloud cli tool

git-subtree-dir: tools
git-subtree-split: a3b18bfe932ddb8adaceb0adb2df35c579bf4ee4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@peterbourgon peterbourgon

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Docker process mapper
2 participants
@tomwilkie @peterbourgon