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

feature: Allow multi snapshotters #2631

Conversation

wangforthinker
Copy link
Contributor

@wangforthinker wangforthinker commented Dec 28, 2018

Ⅰ. Describe what this PR did

Add a daemon config allow-multi-snapshotter, if set true, pouchd will allow multi snapshotter.

Ⅱ. Does this pull request fix one issue?

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

Add test.

Ⅳ. Describe how to verify it

Add a flag allow-multi-snapshotter, if set true, pouchd will ignore check multi snapshotter snapshots.

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Dec 28, 2018

Codecov Report

Merging #2631 into master will decrease coverage by 1.53%.
The diff coverage is 40%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2631      +/-   ##
==========================================
- Coverage   69.57%   68.04%   -1.54%     
==========================================
  Files         280      280              
  Lines       18844    18845       +1     
==========================================
- Hits        13111    12823     -288     
- Misses       4268     4526     +258     
- Partials     1465     1496      +31
Flag Coverage Δ
#criv1alpha1test 31.35% <40%> (-0.05%) ⬇️
#criv1alpha2test 35.56% <40%> (-0.15%) ⬇️
#integrationtest 41.59% <40%> (-0.09%) ⬇️
#nodee2etest ?
#unittest 26.91% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
daemon/config/config.go 66.21% <ø> (ø) ⬆️
daemon/daemon_utils.go 62.5% <ø> (+12.5%) ⬆️
daemon/daemon.go 68.58% <0%> (ø) ⬆️
ctrd/client.go 64.04% <41.37%> (-6.43%) ⬇️
cri/stream/remotecommand/websocket.go 0% <0%> (-81.54%) ⬇️
cri/stream/remotecommand/exec.go 36.66% <0%> (-43.34%) ⬇️
cri/ocicni/cni_manager.go 54.9% <0%> (-15.69%) ⬇️
cri/stream/remotecommand/errors.go 14.28% <0%> (-14.29%) ⬇️
cri/v1alpha2/cri_wrapper.go 53.2% <0%> (-13.6%) ⬇️
pkg/streams/utils.go 82.14% <0%> (-9.53%) ⬇️
... and 17 more

@Ace-Tang
Copy link
Contributor

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Dec 28, 2018
@wangforthinker wangforthinker force-pushed the feature/support-multi-snapshotter branch from 2c93355 to 3fde0e9 Compare December 28, 2018 09:48
@allencloud allencloud changed the title [feature] Allow multi snapshotter feature: Allow multi snapshotters Dec 28, 2018
daemon/daemon_utils.go Outdated Show resolved Hide resolved
daemon/daemon_utils.go Outdated Show resolved Hide resolved
daemon/daemon_utils.go Outdated Show resolved Hide resolved
@allencloud
Copy link
Collaborator

allencloud commented Dec 28, 2018

I left several comments. Wish to get your feedback to move on. @wangforthinker

@pouchrobot pouchrobot added size/L and removed size/M labels Dec 28, 2018
@wangforthinker wangforthinker force-pushed the feature/support-multi-snapshotter branch from add569a to 5756e6a Compare December 28, 2018 13:25
…in pouchd

Signed-off-by: allen.wang <allen.wq@alipay.com>
@wangforthinker wangforthinker force-pushed the feature/support-multi-snapshotter branch 2 times, most recently from 9efe156 to bd79050 Compare December 29, 2018 09:30
@allencloud
Copy link
Collaborator

Thanks for your update again. I removed the DO-NOT-MERGE label. In addition, after the update you made, I think it is necessary for @Ace-Tang to take a review again since the code change. WDYT? @Ace-Tang
If it still satisfies you, I think we could make to make this move on to merge.

@Ace-Tang
Copy link
Contributor

Ace-Tang commented Jan 2, 2019

Look good to me, /cc @allencloud

@allencloud
Copy link
Collaborator

Thanks for your review. Merging... @Ace-Tang

@allencloud allencloud merged commit 1592a60 into AliyunContainerService:master Jan 2, 2019
@Ace-Tang
Copy link
Contributor

Ace-Tang commented Jan 2, 2019

PR should not be added to fixed, #2585 was closed by error

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature LGTM one maintainer or community participant agrees to merge the pull reuqest. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants