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

oomparser: don't get stuck for certain processes #1706

Merged
merged 1 commit into from
Aug 1, 2017

Conversation

euank
Copy link
Collaborator

@euank euank commented Jul 27, 2017

The oomparser logic would end up stuck, unable to detect the end of a
given oom trace, for any process witha a name that didn't match \w+.

This includes processes like "python3.4" due to the '.', or
'docker-containerd' due to the '-'.

This fix was included in pr #1544 last year, but since that PR seems
dead it seems like a good idea to break this more important fix out.

I've updated the test such that it would have caught this issue.

@euank
Copy link
Collaborator Author

euank commented Jul 27, 2017

/retest

@dashpole
Copy link
Collaborator

dashpole commented Aug 1, 2017

/test pull-cadvisor-e2e

@dashpole
Copy link
Collaborator

dashpole commented Aug 1, 2017

rebase, and this should pass

@euank euank force-pushed the unix-processes-are-not-words branch 2 times, most recently from c8d944b to a9292f8 Compare August 1, 2017 20:32
@euank
Copy link
Collaborator Author

euank commented Aug 1, 2017

Rebased.

The oomparser logic would end up stuck, unable to detect the end of a
given oom trace, for any process with a name that didn't match \w+.

This includes processes like 'python3.4' due to the '.', or
'docker-containerd' due to the '-'.

This fix was included in pr google#1544 last year, but since that PR seems
dead it seems like a good idea to break this more important fix out.

I've updated the tests such that they would have caught this issue.
@euank euank force-pushed the unix-processes-are-not-words branch from a9292f8 to fe722c7 Compare August 1, 2017 23:21
Copy link
Collaborator

@dashpole dashpole left a comment

Choose a reason for hiding this comment

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

LGTM

@dashpole dashpole merged commit 83dea17 into google:master Aug 1, 2017
@euank euank deleted the unix-processes-are-not-words branch August 1, 2017 23:37
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.

None yet

2 participants