Skip to content
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.

Sign up for GitHub

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

Jump to bottom

jewel: rgw: multipart uploads copy part support #13219

Merged
merged 9 commits into from Mar 28, 2017
Merged

jewel: rgw: multipart uploads copy part support #13219

merged 9 commits into from Mar 28, 2017

Conversation

mattbenjamin
Copy link
Contributor

@mattbenjamin mattbenjamin commented Feb 1, 2017 •
edited by smithfarm

http://tracker.ceph.com/issues/18714

Replaces merged PR and its revert:
#13068
#13160 (reverted 13068)

@mattbenjamin
Copy link
Contributor Author

@smithfarm this is a clean cherry-pick from the version we downstreamed, which had the following clean rgw suite runs:
http://pulpito.ceph.com/mbenjamin-2017-01-30_06:14:56-rgw-wip-jewel-mg-errortrans---basic-smithi/
http://pulpito.ceph.com/mbenjamin-2017-01-30_05:49:07-rgw-wip-jewel-mg-errortrans---basic-smithi/
(only errors seen are valgrind issues otherwise accounted for)

@smithfarm
Copy link
Contributor

Hi @mattbenjamin There should be only one "cherry picked from" line in each commit, and it should point to the corresponding commit in master. Conflict resolution should be described. That's the ideal we strive for, anyway.

@smithfarm
Copy link
Contributor

Ultimately, though, it's the RGW team that has to live with the code, so if @yehudasa approves we can test and merge it as is.

@smithfarm smithfarm changed the title Jewel rgw multipart upload copy 4 [DNM] Jewel rgw multipart upload copy 4 Feb 1, 2017
@smithfarm
Copy link
Contributor

smithfarm commented Feb 1, 2017 •
edited

@mattbenjamin I looked at the first commit. It is a cherry pick of a commit that is already in jewel. So it can be dropped. Please go through the commits and remove all that are already in jewel.

EDIT: a simple rebase should remove them automagically

@yuyuyu101 yuyuyu101 added this to the jewel milestone Feb 6, 2017
@smithfarm smithfarm changed the title [DNM] Jewel rgw multipart upload copy 4 jewel: rgw: multipart uploads copy part support Mar 3, 2017
@smithfarm
Copy link
Contributor

Ah, now I see the commits are in jewel but were reverted, and this PR is re-introducing them plus an additional commit fixing the regression. Removing DNM. @mattbenjamin I understand you ran two RGW suites on this - can you post pulpito links?

jmunhoz and others added 9 commits March 27, 2017 18:47
@jmunhoz @mattbenjamin
rgw: multipart uploads copy part support
b56b719 
Add multipart uploads copy part feature.

Fixes: http://tracker.ceph.com/issues/12790

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit 949480c)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@jmunhoz @mattbenjamin
rgw: doc: add multipart uploads copy part feature as supported
bd118b5 
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit 8a7ebee)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: multipart copy part, chunked read
2588e95 
Don't read the entire range from source object, read it in parts.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 4049e47)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: multipart copy, check for empty bucket, improve logging
3eb9dc9 
also reduce log level for non critical user errors.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2bcb3d2)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: multipart copy part minor parsing cleanup
9ab65f5 
no need for range.size()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6e9b824)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: multipart copy-part handle versionId
135f84d 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 53521ef)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: rgw_obj_key use adjustment in multipart copy part
2161376 
This fixes a case where objects start with double underscore.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 29fece3)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: minor optimization
a3fdf0e 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 4919dc9)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@yehudasa @mattbenjamin
rgw: multipart part copy, fix regression
9910eac 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 66fbe93)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@mattbenjamin mattbenjamin force-pushed the jewel-rgw-multipart-upload-copy-4 branch from d5d34ae to 9910eac Compare March 27, 2017 22:53
@mattbenjamin
Copy link
Contributor Author

@ktdreyer, @cbodley invalid extra cherry-picked-from hashes removed

@mattbenjamin
Copy link
Contributor Author

@cbodley could you review (this is already downstreamed)

@mattbenjamin
Copy link
Contributor Author

mattbenjamin commented Mar 28, 2017 •
edited

http://pulpito.ceph.com/mbenjamin-2017-03-27_20:45:25-rgw-wip-rgw-13219---basic-smithi/
(all passed)

cbodley
cbodley approved these changes Mar 28, 2017
View reviewed changes
Copy link
Contributor

@cbodley cbodley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@mattbenjamin
Copy link
Contributor Author

@cbodley thanks casey!

@ktdreyer ktdreyer merged commit 9910eac into ceph:jewel Mar 28, 2017
ktdreyer added a commit that referenced this pull request Mar 28, 2017
@ktdreyer
Merge pull request #13219 from linuxbox2/jewel-rgw-multipart-upload-c…
250071e 
…opy-4

jewel: rgw: multipart uploads copy part support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbodley cbodley cbodley approved these changes

Assignees

@smithfarm smithfarm

Labels
feature rgw
Projects
None yet
Milestone
jewel
7 participants
@mattbenjamin @smithfarm @cbodley @ktdreyer @yuyuyu101 @jmunhoz @yehudasa