rgw: move forward_request_to_master() out of sal by cbodley · Pull Request #50599 · ceph/ceph

cbodley · 2023-03-20T16:19:32Z

bucket creation/deletion were the only things that used it inside of sal. it's now the caller's responsibility to forward these requests before calling into sal. in order for RGWBucketCreate to call forward_request_to_master() itself, other things like bucket placement needed to move out as well

renamed the sal::Driver::get_bucket() functions that load the bucket from storage to load_bucket(). the non-loading get_bucket() function never fails, so it now returns std::unique_ptr<Bucket> directly

because RGWBucketCreate always has to handle the existing-bucket case, i moved the create_bucket() function from sal::User into sal::Bucket::create(). that allows us to reuse the handle we allocated in sal::Driver::load_bucket()

finally, moves Driver::forward_request_to_master() to a free function in rgw_op.cc, and Driver::forward_iam_request_to_master() to a free function in rgw_rest_role.cc

Show available Jenkins commands

jenkins retest this please
jenkins test classic perf
jenkins test crimson perf
jenkins test signed
jenkins test make check
jenkins test make check arm64
jenkins test submodules
jenkins test dashboard
jenkins test dashboard cephadm
jenkins test api
jenkins test docs
jenkins render docs
jenkins test ceph-volume all
jenkins test ceph-volume tox
jenkins test windows

cbodley · 2023-03-21T20:17:39Z

fixed up the dbstore tests now that the caller no longer passes in an objv to create_bucket()

github-actions · 2023-03-30T15:46:13Z

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

cbodley · 2023-05-15T21:07:54Z

passed qa after rerun https://pulpito.ceph.com/cbodley-2023-05-15_13:00:49-rgw-wip-cbodley-testing-distro-default-smithi/

github-actions · 2023-06-22T00:21:25Z

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

yuriw · 2023-07-12T20:42:54Z

@cbodley needs rebase and merge

github-actions · 2023-10-01T15:01:41Z

This pull request has been automatically marked as stale because it has not had any activity for 60 days. It will be closed if no further activity occurs for another 30 days.
If you are a maintainer or core committer, please follow-up on this pull request to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

Signed-off-by: Casey Bodley <[email protected]>

this avoids the need to construct a temporary rgw_bucket_key just to construct a rgw_bucket without an instance id Signed-off-by: Casey Bodley <[email protected]>

Signed-off-by: Casey Bodley <[email protected]>

cbodley · 2023-11-06T20:36:36Z

now tempest.api.object_storage.test_account_bulk.BulkTest.test_extract_archive is failing to list an object from the archive

the rgw log seems to think the bucket created by bulk-upload only has a single shard, so doesn't find the object inside:

swift:list_bucket cls_bucket_list_ordered: request from each of 1 shard(s) for 10001 entries to get 10001 total entries

when i tried to reproduce this under vstart, it had the expected 11 shards:

swift:list_bucket cls_bucket_list_ordered: request from each of 11 shard(s) for 976 entries to get 10001 total entries

the reproducer, including the magic curl command (where X-Auth-Token was copied from swift list --debug output):

# contents of archive.tar:
$ tar -tf archive.tar
archive/
archive/foo.txt

# upload archive.tar to the account root:
$ curl -i http://localhost:8000/swift/v1?extract-archive=tar -X PUT -H "X-Auth-Token: AUTH_rgwtk0b000000746573743a746573746572b7c23cb32a2810d1d7824a654d45c31f67ffa8be2fd012232586f398831746431d7dfe8a" -H "Content-Length: 10240" --data-binary "@archive.tar"
HTTP/1.1 200 OK
Transfer-Encoding: chunked
X-Trans-Id: tx000001049b8c5eedd0d97-0065494b4b-1033-default
X-Openstack-Request-Id: tx000001049b8c5eedd0d97-0065494b4b-1033-default
Content-Type: text/plain; charset=utf-8
Server: Ceph Object Gateway (reef)
Date: Mon, 06 Nov 2023 20:23:45 GMT
Connection: Keep-Alive

Number Files Created: 1
Response Body: 
Response Status: 201 Created
Errors: 

# list the extracted 'archive' container:
$ swift -A http://localhost:8000/auth/v1 -U test:tester -K testing list archive
foo.txt

pritha-srivastava · 2023-11-07T03:50:22Z

src/rgw/rgw_rest_role.cc


 using namespace std;

+int forward_iam_request_to_master(const DoutPrefixProvider* dpp,


@cbodley : Just a question here - if in future we plan to add multisite replication for oidc-provider in rgw, where should this method be shifted to? rgw_rest_iam.h?

rgw_rest_conn.* might be a good place since these functions depend on RGWRESTConn

the CreateBucket operation always has to deal with existing buckets, so we have to load the Bucket handle first anyway also moves the related placement and forward_request_to_master() logic out of sal entirely Signed-off-by: Casey Bodley <[email protected]>

Signed-off-by: Casey Bodley <[email protected]>

cbodley · 2023-11-07T19:50:32Z

now tempest.api.object_storage.test_account_bulk.BulkTest.test_extract_archive is failing to list an object from the archive

ok, fixed by adding the createparams.zone_placement = rgw::find_zone_placement(...) to RGWBulkUploadOp::handle_dir(). will rerun the whole suite now

cbodley · 2023-11-08T13:52:24Z

jenkins test api

cbodley · 2023-11-08T17:23:43Z

qa in https://pulpito.ceph.com/cbodley-2023-11-07_19:46:35-rgw-wip-rgw-sal-forward-distro-default-smithi/ hit a strange test_s3select.py::test_column_sum_min_max failure in rgw/crypt/barbican that i haven't seen before, but it went away with a rerun https://pulpito.ceph.com/cbodley-2023-11-08_13:38:09-rgw-main-distro-default-smithi/, so i'm calling this a pass

cbodley · 2023-11-08T17:29:50Z

oops, that rerun didn't use the right ceph branch. re-rerunning in https://pulpito.ceph.com/cbodley-2023-11-08_17:26:47-rgw-wip-rgw-sal-forward-distro-default-smithi/

edit: the rgw/crypt job passed there too

cbodley · 2024-01-11T15:34:03Z

src/rgw/rgw_rest_role.cc

+  auto conn = RGWRESTConn{dpp->get_cct(), z->second.id, z->second.endpoints,
+                          std::move(creds), zg->second.id, zg->second.api_name};
+  bufferlist outdata;
+  constexpr size_t max_response_size = 128 * 1024; // we expect a very small response
+  int ret = conn.forward_iam_request(dpp, creds, req, nullptr, max_response_size,
+                                     &indata, &outdata, y);


oops, creds was moved into the RGWRESTConn ctor call above. i opened #55148 to address this

cc @jzhu116-bloomberg

cbodley added cleanup rgw labels Mar 20, 2023

cbodley requested a review from a team as a code owner March 20, 2023 16:19

cbodley force-pushed the wip-rgw-sal-forward branch from 6191a7a to f6ee32a Compare March 20, 2023 19:00

github-actions bot added the tests label Mar 20, 2023

cbodley force-pushed the wip-rgw-sal-forward branch from f6ee32a to 2d301f1 Compare March 20, 2023 19:25

dang approved these changes Mar 21, 2023

View reviewed changes

cbodley force-pushed the wip-rgw-sal-forward branch from 2d301f1 to e94dd36 Compare March 21, 2023 20:14

github-actions bot added the needs-rebase label Mar 30, 2023

cbodley force-pushed the wip-rgw-sal-forward branch from e94dd36 to 9f9d53b Compare April 18, 2023 13:59

cbodley added needs-qa and removed needs-rebase labels Apr 18, 2023

cbodley added the wip-cbodley-testing label May 11, 2023

cbodley added ready-to-merge and removed needs-qa wip-cbodley-testing labels May 15, 2023

github-actions bot added the needs-rebase label Jun 22, 2023

cbodley removed the ready-to-merge label Aug 2, 2023

This was referenced Aug 7, 2023

rgw: check for location constraint on master zonegroup #52791

Merged

RGW - Add POSIX Driver #52933

Merged

github-actions bot added the stale label Oct 1, 2023

cbodley force-pushed the wip-rgw-sal-forward branch from 9f9d53b to 7079703 Compare October 3, 2023 14:38

github-actions bot removed the needs-rebase label Oct 3, 2023

cbodley requested a review from dang October 3, 2023 14:40

cbodley added 6 commits November 6, 2023 11:07

rgw/services: make set_attrs const correct

1b4e09e

Signed-off-by: Casey Bodley <[email protected]>

rgw/sal: rename loading get_bucket()s to load_bucket()

ad7c577

Signed-off-by: Casey Bodley <[email protected]>

rgw/sal: remove load_bucket() overload with tenant/name

89882f2

Signed-off-by: Casey Bodley <[email protected]>

rgw: add rgw_bucket() ctor for tenant+name

8b7947d

this avoids the need to construct a temporary rgw_bucket_key just to construct a rgw_bucket without an instance id Signed-off-by: Casey Bodley <[email protected]>

rgw: use load_bucket()'s rgw_bucket overload

015c415

Signed-off-by: Casey Bodley <[email protected]>

rgw: add free function rgw::get_zonegroup_endpoint()

d2756f1

Signed-off-by: Casey Bodley <[email protected]>

cbodley force-pushed the wip-rgw-sal-forward branch from 987cf04 to f51364d Compare November 6, 2023 16:09

github-actions bot removed the needs-rebase label Nov 6, 2023

cbodley mentioned this pull request Nov 7, 2023

rgw/sal: Bucket owner as rgw_user #54379

Merged

pritha-srivastava reviewed Nov 7, 2023

View reviewed changes

cbodley added 7 commits November 7, 2023 12:18

rgw/sal: remove ZoneGroup::get_endpoint()

5e344c7

Signed-off-by: Casey Bodley <[email protected]>

rgw: forward_request takes const req_info

0b737d5

Signed-off-by: Casey Bodley <[email protected]>

rgw: add free function rgw_forward_request_to_master()

d2dbe75

Signed-off-by: Casey Bodley <[email protected]>

rgw: add free function forward_iam_request_to_master()

d3ad0ef

Signed-off-by: Casey Bodley <[email protected]>

rgw/sal: remove forward-to-master functions from Driver

e93b6bb

Signed-off-by: Casey Bodley <[email protected]>

rgw/sal: rename Bucket::remove_bucket() to remove()

0ead6ff

Signed-off-by: Casey Bodley <[email protected]>

cbodley force-pushed the wip-rgw-sal-forward branch from f51364d to 0ead6ff Compare November 7, 2023 17:18

cbodley added needs-qa wip-cbodley-testing labels Nov 8, 2023

cbodley merged commit 96f65fd into ceph:main Nov 8, 2023

jzhu116-bloomberg mentioned this pull request Jan 10, 2024

rgw/multisite: maintain endpoints connectable status and retry the requests to them when appropriate #53320

Merged

14 tasks

cbodley commented Jan 11, 2024

View reviewed changes

cbodley mentioned this pull request Jan 12, 2024

rgw: fix use of creds in forward_iam_request() #55148

Merged

clwluvw mentioned this pull request Dec 17, 2024

rgw/multisite: include request body when CreateBucket op is forwarded to master #59960

Merged

14 tasks


		using namespace std;

		int forward_iam_request_to_master(const DoutPrefixProvider* dpp,

Conversation

cbodley commented Mar 20, 2023

Uh oh!

cbodley commented Mar 21, 2023

Uh oh!

github-actions bot commented Mar 30, 2023

Uh oh!

cbodley commented May 15, 2023

Uh oh!

github-actions bot commented Jun 22, 2023

Uh oh!

yuriw commented Jul 12, 2023

Uh oh!

github-actions bot commented Oct 1, 2023

Uh oh!

cbodley commented Nov 6, 2023

Uh oh!

pritha-srivastava Nov 7, 2023

Choose a reason for hiding this comment

Uh oh!

cbodley Nov 7, 2023

Choose a reason for hiding this comment

Uh oh!

cbodley commented Nov 7, 2023

Uh oh!

cbodley commented Nov 8, 2023

Uh oh!

cbodley commented Nov 8, 2023

Uh oh!

cbodley commented Nov 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cbodley Jan 11, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cbodley commented Nov 8, 2023 •

edited

Loading