Skip to content

Fix a race in daemon/logger.TestCopier#22969

Merged
cpuguy83 merged 1 commit intomoby:masterfrom
AkihiroSuda:fix22963LogRace
May 25, 2016
Merged

Fix a race in daemon/logger.TestCopier#22969
cpuguy83 merged 1 commit intomoby:masterfrom
AkihiroSuda:fix22963LogRace

Conversation

@AkihiroSuda
Copy link
Member

- What I did
Fixed a race found in #22963

- How I did it
Introduced a mutex

- How to verify it
TESTDIRS=daemon/logger BUILDFLAGS=-race TESTFLAGS="-test.count 1000" make test-unit

Update #22963 (not closable yet, due to another race in awslogs)
Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

Update moby#22963

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
AkihiroSuda added a commit to AkihiroSuda/docker that referenced this pull request May 25, 2016
Fix moby#22963 (with moby#22969)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
@vdemeester
Copy link
Member

LGTM 👼
/cc @runcom @LK4D4

@cpuguy83
Copy link
Member

LGTM

@cpuguy83 cpuguy83 merged commit a41e823 into moby:master May 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants