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

Synchronize the cursor returned by followJournal #31263

Merged
merged 1 commit into from Feb 23, 2017

Conversation

Projects
None yet
7 participants
@nalind
Contributor

nalind commented Feb 22, 2017

Make sure that the cursor value returned by followJournal() is the last of the values returned by its goroutine's calls to drainJournal() by waiting for the goroutine to explicitly send the intended value back to its caller. Previously, if followJournal() signalled the goroutine that its work was done by closing a pipe, depending on scheduling, it was possible for followJournal() to return a value which the goroutine would also pass to drainJournal(), which would free the value and allocate another one.

Along with #31231, this may be part of the cause for #30433.

Synchronize the cursor returned by followJournal
Make sure that the cursor value returned by followJournal() is the last
of the values returned by its goroutine's calls to drainJournal() by
waiting for it, rather than returning a value that may be superceded by
another if we're singalling the goroutine that it should exit by closing
a pipe.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@mlaventure

LGTM

@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Feb 22, 2017

Collaborator

LGTM

Collaborator

tiborvass commented Feb 22, 2017

LGTM

@LK4D4 LK4D4 merged commit b3e7f70 into moby:master Feb 23, 2017

4 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 31037 has succeeded
Details
janky Jenkins build Docker-PRs 39649 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 10715 has succeeded
Details

@GordonTheTurtle GordonTheTurtle added this to the 17.04.0 milestone Feb 23, 2017

@vieux vieux modified the milestones: 17.03.0, 17.04.0 Feb 23, 2017

@vieux vieux referenced this pull request Feb 23, 2017

Merged

17.03 cherry-picks #31266

@thaJeztah thaJeztah removed this from PRs in 17.03.2-maybe Feb 23, 2017

This was referenced Mar 7, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment