]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/ReplicatedPG: fix user_version preservation for copy_from
authorSage Weil <sage@inktank.com>
Thu, 12 Dec 2013 23:40:41 +0000 (15:40 -0800)
committerSage Weil <sage@inktank.com>
Fri, 20 Dec 2013 00:39:59 +0000 (16:39 -0800)
commit927b0e60c2ddf210faf13b198c98e11972805d28
tree5c7808996b4240afffb7b893cafed0799db2318a
parentbc05104149cb17a698d44d01149099b13918dc32
osd/ReplicatedPG: fix user_version preservation for copy_from

In the process of fixing this for flush, we break promote, so we need to
adjust them both here.  Basic strategy: do not set user_modify, but handle
the user_version explicitly in the callbacks.

For copy_from, we don't have a clean way to pass the result through to
finish_copyfrom in do_osd_ops; do so by putting it in user_at_version. (If
we were to call finish_copyfrom directly from the callback this might
be simpler, but let's not go there right now.)

For promote, it is a trivial fix.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc