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

jewel: rgw: Custom data header support #15966

Merged
merged 1 commit into from Sep 6, 2017

Conversation

Projects
None yet
3 participants
@prallabh
Contributor

prallabh commented Jun 28, 2017

Fixes: http://tracker.ceph.com/issues/19844
Signed-off-by: Pavan Rallabhandi PRallabhandi@walmartlabs.com

@prallabh

This comment has been minimized.

Show comment
Hide comment
@prallabh

prallabh Jun 28, 2017

Contributor

@mattbenjamin can you please help review, since you had an RH equivalent patch, thanks!

Contributor

prallabh commented Jun 28, 2017

@mattbenjamin can you please help review, since you had an RH equivalent patch, thanks!

@prallabh

This comment has been minimized.

Show comment
Hide comment
@prallabh
Contributor

prallabh commented Jun 28, 2017

@smithfarm smithfarm added this to the jewel milestone Jun 28, 2017

@tchaikov tchaikov changed the title from Custom data header support on Jewel to jewel: Custom data header support on Jewel Jun 28, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jun 28, 2017

Contributor

@prallabh Is there a reason why this wasn't cherry-picked from master?

Contributor

smithfarm commented Jun 28, 2017

@prallabh Is there a reason why this wasn't cherry-picked from master?

@prallabh

This comment has been minimized.

Show comment
Hide comment
@prallabh

prallabh Jun 28, 2017

Contributor

It's not a direct patch from master, like we don't have RGWObjEnt present in master unlike here.

Contributor

prallabh commented Jun 28, 2017

It's not a direct patch from master, like we don't have RGWObjEnt present in master unlike here.

@prallabh

This comment has been minimized.

Show comment
Hide comment
@prallabh

prallabh Jul 5, 2017

Contributor

@smithfarm can you please check now, I've cherry picked from master, thanks!

Contributor

prallabh commented Jul 5, 2017

@smithfarm can you please check now, I've cherry picked from master, thanks!

@smithfarm smithfarm changed the title from jewel: Custom data header support on Jewel to jewel: rgw: Custom data header support on Jewel Jul 5, 2017

@smithfarm smithfarm requested a review from mattbenjamin Jul 5, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jul 5, 2017

Contributor

Thanks, @prallabh, the commit message looks good now. I'll include this in the next integration run.

Contributor

smithfarm commented Jul 5, 2017

Thanks, @prallabh, the commit message looks good now. I'll include this in the next integration run.

@smithfarm smithfarm changed the title from jewel: rgw: Custom data header support on Jewel to jewel: rgw: Custom data header support Jul 12, 2017

@smithfarm smithfarm changed the title from jewel: rgw: Custom data header support to [DNM] jewel: rgw: Custom data header support Aug 27, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Aug 27, 2017

Contributor

Merge conflict. @prallabh please rebase.

Contributor

smithfarm commented Aug 27, 2017

Merge conflict. @prallabh please rebase.

rgw: add a field to store generic user data in the bucket index,
that can be populated/fetched via a configurable custom http header

Signed-off-by: Pavan Rallabhandi <prallabhandi@walmartlabs.com>
(cherry picked from commit abca7a8)

Conflicts:
	src/rgw/rgw_op.cc
		Number of arguments to RGWPutObjProcessor_Multipart::do_complete has been changed in master with an extra field accounted_size added, which is not required in Jewel.
        	Number of arguments for the processor->complete() has been changed in master, which is not required in Jewel.

	src/rgw/rgw_op.h
		A new member field `crypt_http_responses` is added in the class `RGWPutObj` in master, which is not required in Jewel.

	src/rgw/rgw_rados.cc
        	In the function RGWPutObjProcessor::complete() there is an extra argument to do_complete() in master, which is not required in Jewel.
        	In the function RGWPutObjProcessor_Atomic::do_complete, a call to obj_op.write_meta has accounted_size, which is not required in Jewel.
        	There is an extra argument accounted_size in RGWRados::Bucket::UpdateIndex::complete in master, which is not required in Jewel.
        	In RGWRados::Bucket::UpdateIndex::complete, RGWObjEnt has been removed in master, which has to be retained in Jewel.
        	In RGWRados::cls_obj_complete_op, user_data is added to the rgw_bucket_dir_entry_meta structure.
        	In RGWRados::cls_bucket_list, the user_data field of RGWObjEnt is populated.

	src/rgw/rgw_rados.h
        	In UpdateIndex::complete(), remove_objs is of type rgw_obj_key in Jewel instead of rgw_obj_index_key
        	Corrected various function declarations as appropriate.
        	RGWPutObjProcessor_Multipart is not part of this file in Jewel.

	src/rgw/rgw_rest_swift.cc
		In RGWListBucket_ObjStore_SWIFT::send_response(), accounted_size is not required in Jewel.

	src/rgw/rgw_common.h
		Add user_data field in RGWObjEnt structure.

	src/rgw/rgw_json_enc.cc
		Add user_data field while dumping RGWObjEnt.
@prallabh

This comment has been minimized.

Show comment
Hide comment
@prallabh

prallabh Aug 28, 2017

Contributor

@smithfarm done

Contributor

prallabh commented Aug 28, 2017

@smithfarm done

@smithfarm smithfarm changed the title from [DNM] jewel: rgw: Custom data header support to jewel: rgw: Custom data header support Aug 28, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Aug 29, 2017

Contributor

jenkins build docs

Contributor

smithfarm commented Aug 29, 2017

jenkins build docs

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Aug 29, 2017

Contributor

jenkins test docs

Contributor

smithfarm commented Aug 29, 2017

jenkins test docs

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Sep 2, 2017

Contributor

@mattbenjamin This passed an rgw suite at http://tracker.ceph.com/issues/20613#note-43

Please review.

Contributor

smithfarm commented Sep 2, 2017

@mattbenjamin This passed an rgw suite at http://tracker.ceph.com/issues/20613#note-43

Please review.

@smithfarm smithfarm requested review from yehudasa, cbodley and oritwas Sep 3, 2017

@oritwas

oritwas approved these changes Sep 3, 2017

@smithfarm smithfarm merged commit 18e5db0 into ceph:jewel Sep 6, 2017

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment