]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: merge manifests correctly when there's prefix override 4697/head
authorYehuda Sadeh <yehuda@redhat.com>
Thu, 14 May 2015 00:05:22 +0000 (17:05 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 15 May 2015 18:11:09 +0000 (11:11 -0700)
commitcd8f1830eb5d7ff75b17d7f0915ee4b3b834b149
tree71e9b9f1684711f8a0971a1f9ce2dc76260e4359
parenteef3d2f1c400573db90936fd417769183950b6ee
rgw: merge manifests correctly when there's prefix override

Fixes: #11622
Backport: hammer, firefly

Prefix override happens in a manifest when a rados object does not
conform to the generic prefix set on the manifest. When merging
manifests (specifically being used in multipart objects upload), we need
to check if the rule that we try to merge has a prefix that is the same
as the previous rule. Beforehand we checked if both had the same
override_prefix setting, but that might not apply as both manifests
might have different prefixes.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 389ae6739ddc6239a4dd7c5f7f9bfc9b645b8577)
src/rgw/rgw_rados.cc