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

mon/OSDMonitor: make snaps on tier pool should not be allowed #9348

Merged
merged 2 commits into from Jan 25, 2017

Conversation

Projects
None yet
3 participants
@LiumxNL
Contributor

LiumxNL commented May 26, 2016

Signed-off-by: Mingxin Liu mingxin@xsky.com

@ghost

This comment has been minimized.

ghost commented Nov 22, 2016

jenkins test this please (jenkins hung)

@ghost ghost added core bug fix labels Nov 23, 2016

@LiumxNL

This comment has been minimized.

Contributor

LiumxNL commented Jan 16, 2017

@tchaikov please review, thanks!

@LiumxNL LiumxNL changed the title from OSDMonitor: make pool snaps on cache tier should be not allowed to OSDMonitor: make snaps on tier pool should not be allowed Jan 16, 2017

@@ -7891,7 +7899,7 @@ bool OSDMonitor::preprocess_pool_op(MonOpRequestRef op)
}
return false;
case POOL_OP_DELETE_SNAP:
if (p->is_unmanaged_snaps_mode()) {
if (p->is_unmanaged_snaps_mode() || p->is_tier()) {

This comment has been minimized.

@tchaikov

tchaikov Jan 16, 2017

Contributor

it's not necessary to check if p->is_tier() again? if it is not allowed to create a snap for a tier pool?

@@ -7008,6 +7012,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
ss << "pool " << poolstr << " snap " << snapname << " does not exist";
err = 0;
goto reply;
} else if (p->is_tier()) {

This comment has been minimized.

@tchaikov

tchaikov Jan 16, 2017

Contributor

ditto.

@tchaikov tchaikov added the mon label Jan 16, 2017

LiumxNL added some commits May 26, 2016

OSDMonitor: make pool snaps on cache tier should be not allowed
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
test: cannot create pool snap on tier
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
@LiumxNL

This comment has been minimized.

Contributor

LiumxNL commented Jan 21, 2017

@tchaikov updated.

@tchaikov tchaikov added the needs-qa label Jan 21, 2017

@liewegas liewegas changed the title from OSDMonitor: make snaps on tier pool should not be allowed to mon/OSDMonitor: make snaps on tier pool should not be allowed Jan 25, 2017

@liewegas liewegas merged commit 9080596 into ceph:master Jan 25, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment