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

bugfix: fix pouch panic on fatal error: concurrent map read and map write. #2806

Merged
merged 2 commits into from
Apr 23, 2019

Conversation

yyb196
Copy link
Collaborator

@yyb196 yyb196 commented Apr 19, 2019

Ⅰ. Describe what this PR did

bugfix: fix pouch panic on fatal error: concurrent map read and map write.

And fix bugs which make container state a mess when deleting, restarting and stopping are going simultaneously.

Signed-off-by: frankyang yyb196@gmail.com

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

this bug hard to reproduce.

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

…rite.

Signed-off-by: frankyang <yyb196@gmail.com>
@codecov
Copy link

codecov bot commented Apr 19, 2019

Codecov Report

Merging #2806 into master will increase coverage by 0.03%.
The diff coverage is 73.91%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2806      +/-   ##
==========================================
+ Coverage    69.4%   69.44%   +0.03%     
==========================================
  Files         278      278              
  Lines       17373    17389      +16     
==========================================
+ Hits        12058    12076      +18     
+ Misses       3971     3970       -1     
+ Partials     1344     1343       -1
Flag Coverage Δ
#criv1alpha2_test 39.3% <60.86%> (ø) ⬆️
#integration_test_0 36.62% <60.86%> (+0.06%) ⬆️
#integration_test_1 35.32% <60.86%> (ø) ⬆️
#integration_test_2 36.52% <60.86%> (+0.07%) ⬆️
#integration_test_3 35.35% <60.86%> (+0.01%) ⬆️
#node_e2e_test 35.1% <73.91%> (+0.04%) ⬆️
#unittest 28.69% <0%> (-0.04%) ⬇️
Impacted Files Coverage Δ
ctrd/container.go 54.26% <100%> (-0.04%) ⬇️
ctrd/watch.go 72.97% <100%> (-4.5%) ⬇️
daemon/mgr/events.go 97.22% <100%> (+8.18%) ⬆️
daemon/mgr/container.go 60.04% <40%> (-0.43%) ⬇️
pkg/streams/utils.go 89.28% <0%> (-2.39%) ⬇️
cri/v1alpha2/cri.go 71.48% <0%> (+0.51%) ⬆️
pkg/meta/store.go 68.99% <0%> (+1.55%) ⬆️
... and 3 more

@pouchrobot pouchrobot added kind/bug This is bug report for project kind/panic priority/P1 this is high priority that all maintainers should stop to handle this issue size/XS labels Apr 19, 2019
@CLAassistant
Copy link

CLAassistant commented Apr 19, 2019

CLA assistant check
All committers have signed the CLA.

@allencloud
Copy link
Collaborator

Lots of test cases fails. PTAL @yyb196
And please sign the CLA, thanks.

…ing are going simultaneously.

Signed-off-by: frankyang <yyb196@gmail.com>
@pouchrobot pouchrobot added size/M and removed size/XS labels Apr 19, 2019
Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project kind/panic priority/P1 this is high priority that all maintainers should stop to handle this issue size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants