apiserver: fix leaks in logsink handler #6519
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anastasiamac
approved these changes
Nov 1, 2016
| logStreamHandler := srv.trackRequests(newLogStreamEndpointHandler(strictCtxt)) | ||
| debugLogHandler := srv.trackRequests(newDebugLogDBHandler(httpCtxt)) | ||
|
|
||
| add("/model/:modeluuid/logsink", logSinkHandler) | ||
| // TODO(axw) close the lumberjack writer. | ||
|
|
There was a problem hiding this comment.
neither the empty line nor the TODO
| MaxBackups: 2, | ||
| }, | ||
| // This isn't a fatal error so log and continue if priming fails. | ||
| logger.Warningf("Unable to prime %s (proceeding anyway): %v", logPath, err) |
There was a problem hiding this comment.
Warning seems appropriate to me
If an error occurs when reading from the logsink client, the handler should close the connection. Also, close the lumberjack WriterCloser when the handler completes.
axw
force-pushed
the
apiserver-logsink-leak
branch
from
754c065
to
c578ef5
Compare
|
!!build!! |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
added a commit
that referenced
this pull request
Nov 2, 2016
apiserver: fix leaks in logsink handler If an error occurs when reading from the logsink client, the handler should close the connection. Also, close the lumberjack WriterCloser when the handler completes. Backport of #6519
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While investigating https://bugs.launchpad.net/juju/+bug/1635311, I noticed a slow but steady increase in the number of goroutines in use by jujud. Taking a goroutine pprof snapshot, and then subsequently taking relative profiles, I found that there was >1 logsink handler. Since there's just one machine agent, this was unexpected.
A bug was introduced in 2.0 which causes the apiserver to not close out the websocket handler if there is a failure to read from the logsink client, except/until the apiserver.Server is stopped. If an error occurs when reading from the logsink client, the handler should close the connection.
Also, close the lumberjack WriterCloser when the apiserver stops.