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

Fix weave tagger crash #976

Merged
merged 3 commits into from
Feb 18, 2016
Merged

Fix weave tagger crash #976

merged 3 commits into from
Feb 18, 2016

Conversation

2opremio
Copy link
Contributor

Fixes #955

@2opremio
Copy link
Contributor Author

@paulbellamy @tomwilkie PTAL

2opremio
2opremio reviewed Feb 17, 2016
View reviewed changes
probe/overlay/weave.go
prefix, _ := node.Latest.Lookup(docker.ContainerID)
prefix = prefix[:12]
prefix, ok := node.Latest.Lookup(docker.ContainerID)
if !ok {

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@2opremio 2opremio mentioned this pull request Feb 17, 2016
Closed
@tomwilkie
Copy link
Contributor

All container nodes should have a docker.ContainerID, but this should be more robust. Please also fix the kubernetes reporter in this PR.

@2opremio
Copy link
Contributor Author

@tomwilkie I just did :)

@tomwilkie
Copy link
Contributor

On minor nit, otherwise LGTM.

We should have a integration test for scope on k8s, as this isn't something we seem to test with in the normal course of development.

2opremio pushed a commit that referenced this pull request Feb 18, 2016
Merge pull request #976 from weaveworks/955-weave-tagger-crash
369e319 
Fix weave tagger crash
@2opremio 2opremio merged commit 369e319 into master Feb 18, 2016
@2opremio 2opremio deleted the 955-weave-tagger-crash branch February 18, 2016 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@2opremio @tomwilkie @paulbellamy