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

Added an oom monitor to manager #522

Merged
merged 1 commit into from
Feb 20, 2015
Merged

Conversation

kateknister
Copy link
Contributor

No description provided.

@cadvisorJenkinsBot
Copy link
Collaborator

Can one of the admins verify this patch?

@vmarmol
Copy link
Contributor

vmarmol commented Feb 19, 2015

ok to test

@@ -623,3 +625,28 @@ func (self *manager) watchForNewContainers(quit chan error) error {
}()
return nil
}

func (self *manager) watchForNewOoms() error {
outStream := make(chan *oomparser.OomInstance)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets make this a buffered channel, we can start with 10? See how that goes :)

@vmarmol
Copy link
Contributor

vmarmol commented Feb 19, 2015

Added some small comments. Let me know when those are addressed :)

@kateknister kateknister force-pushed the apiBranch branch 2 times, most recently from cf62dfe to 3a4519d Compare February 19, 2015 23:28
}
err = oomLog.StreamOoms(outStream)
if err != nil {
glog.Errorf("error streaming OOMs: %v", err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here we can return the error

@vmarmol
Copy link
Contributor

vmarmol commented Feb 20, 2015

LGTM

kateknister added a commit that referenced this pull request Feb 20, 2015
Added an oom monitor to manager
@kateknister kateknister merged commit 7def272 into google:master Feb 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants