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: adding exsting pool as tier with --force-nonempty clobbers removed_snaps #5236

Merged
2 commits merged into from Oct 20, 2015

Conversation

Projects
None yet
4 participants
@smithfarm
Contributor

smithfarm commented Jul 14, 2015

@smithfarm smithfarm self-assigned this Jul 14, 2015

@smithfarm smithfarm added this to the firefly milestone Jul 14, 2015

@smithfarm smithfarm changed the title from mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps to [DNM] mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps Aug 10, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Aug 10, 2015

Merge conflict

@smithfarm smithfarm changed the title from [DNM] mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps to mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps Sep 5, 2015

@ghost

This comment has been minimized.

ghost commented Oct 5, 2015

@smithfarm could you cherry-pick -x bef09e0 into this pull request as well ? I'll test it manually.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Oct 5, 2015

@dachary done

@ghost

This comment has been minimized.

ghost commented Oct 5, 2015

@smithfarm ? 48e0adf is intended ?

liewegas and others added some commits Apr 29, 2015

mon: prevent pool with snapshot state from being used as a tier
If we add a pool with snap state as a tier the snap state gets clobbered
by OSDMap::Incremental::propogate_snaps_to_tiers(), and may prevent OSDs
from starting.  Disallow this.

Include a test.

Fixes: #11493
Backport: hammer, giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bbec53e)

Conflicts:
	qa/workunits/cephtool/test.sh
           properly co-exist with "# make sure we can't create an ec pool tier"
	src/mon/OSDMonitor.cc
           properly co-exist with preceding "if (tp->ec_pool())"
        (The changes to both files would have applied cleanly if
        #5389 had not been merged first.)
test/librados/tier.cc: destroy and recreate cache pool on every test
Namespaces are not sufficient with the checks for 11493 in the mon.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit bef09e0)
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Oct 5, 2015

@dachary Oops, sorry - fixed now.

@ghost

This comment has been minimized.

ghost commented Oct 5, 2015

CEPH_PORT=7000 MON=1 OSD=3 ./vstart.sh -X -d -n -l mon osd
PATH=:$PATH bash -x ../qa/workunits/rados/test.sh 

passes.

ghost pushed a commit that referenced this pull request Oct 20, 2015

Merge pull request #5236: mon: adding exsting pool as tier with --for…
…ce-nonempty clobbers removed_snaps

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 20, 2015

Loic Dachary
Merge pull request #5236 from SUSE/wip-12312-firefly
mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps

Reviewed-by: Loic Dachary <ldachary@redhat.com>

@ghost ghost merged commit f272435 into ceph:firefly Oct 20, 2015

@smithfarm smithfarm deleted the SUSE:wip-12312-firefly branch Oct 20, 2015

This issue was closed.

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