]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-objectstore-tool: prevent import of pg that has since merged
authorSage Weil <sage@redhat.com>
Fri, 15 Jun 2018 15:53:51 +0000 (10:53 -0500)
committerSage Weil <sage@redhat.com>
Fri, 7 Sep 2018 17:09:05 +0000 (12:09 -0500)
commit6bd682f53dfe0b2f7c31b5c1ba081afb72f1dd6c
treef69e124a731eb0a9ca107977261ce07e09bbedaf
parent44de03d5e61b20536eaa5f8ad512b3575cae9280
ceph-objectstore-tool: prevent import of pg that has since merged

We currently import a portion of the PG if it has split.  Merge is more
complicated, though, mainly because COT is operating in a mode where it
fast-forwards the PG to the latest OSDMap epoch, which means it has to
implement any transformations to the PG (split/merge) independently.
Avoid doing this for merge.

Signed-off-by: Sage Weil <sage@redhat.com>
qa/tasks/ceph_manager.py
src/tools/ceph_objectstore_tool.cc