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

rgw: merge manifests correctly when there's prefix override #4697

Merged
2 commits merged into from May 18, 2015

Conversation

Projects
None yet
3 participants
@yehudasa
Member

yehudasa commented May 15, 2015

yehudasa added some commits May 12, 2015

rgw: restore buffer of multipart upload after EEXIST
Fixes #11604
Backport: hammer, firefly

When we need to restart a write of part data, we need to revert to
buffer to before the write, otherwise we're going to skip some data.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 580ccae)
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 389ae67)

@ghost ghost added this to the firefly milestone May 15, 2015

@ghost ghost assigned ghost and unassigned liewegas May 15, 2015

@ghost

This comment has been minimized.

ghost commented May 17, 2015

@yehudasa the rgw suite described at http://tracker.ceph.com/issues/11090#rgw passed on this pull request. Do you think it is ready to merge ?

@ghost

This comment has been minimized.

ghost commented May 18, 2015

@yehudasa hum, I guess we can skip the question since you did the backport, therefore you agree to it already ;-)

ghost pushed a commit that referenced this pull request May 18, 2015

Loic Dachary
Merge pull request #4697 from ceph/wip-11622-firefly
Wip 11622 firefly

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

@ghost ghost merged commit 68211f6 into firefly May 18, 2015

@ghost ghost changed the title from Wip 11622 firefly to rgw: restore buffer of multipart upload after EEXIST Jul 14, 2015

@ghost ghost changed the title from rgw: restore buffer of multipart upload after EEXIST to rgw: merge manifests correctly when there's prefix override Jul 14, 2015

@yehudasa yehudasa deleted the wip-11622-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