Skip to content

Wip 5073 rgw multitenancy#6784

Merged
yehudasa merged 12 commits intomasterfrom
wip-5073
Dec 3, 2015
Merged

Wip 5073 rgw multitenancy#6784
yehudasa merged 12 commits intomasterfrom
wip-5073

Conversation

@yehudasa
Copy link
Member

@yehudasa yehudasa commented Dec 3, 2015

No description provided.

yehudasa and others added 12 commits November 25, 2015 11:16
@yehudasa
rgw: user has a tenant property
788477a 
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
@yehudasa
rgw: buckets within tenant namespace
1f19b60 
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
@zaitcev @yehudasa
rgw: make APIs to work with tenants
f7ca00a 
Previous commits introduced the tenant infrastructure such as
rgw_user, but did not allow anyone to access it productively.

Done:
 - radosgw-admin
 - bucket creation, listing, deletion with non-empty tenant
 - COPY
 - ACLs
 - Using colon for S3 with URL addressing

TODO:
 - Fix S3 remapping of DNS so that period turns into colon in buckets,
   possibly using typed endpoint domains, some assuming tenants
 - Have Swift authentication to set tenant into URL, then pick it there
 - Resolve leftover XXX

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
@yehudasa
rgw: fix tenant/bucket parsing
9bd0b11 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: inherit bucket tenant from user if not specified
e8de349 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: objexp hint name backward compatibility
9425b04 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: avoid calling rgw_make_bucket_entry_name() when not needed
e5bfd94 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: don't allow cross-tenant bucket creation
2287ce9 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: fix a typo
ddb4caa 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: don't re-set bucket tenant and name when selecting location
bf0a7b4 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: a minor cleanup
eda44cd 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa
rgw: remove comments
4230504 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa yehudasa self-assigned this Dec 3, 2015
yehudasa added a commit that referenced this pull request Dec 3, 2015
@yehudasa
Merge pull request #6784 from ceph/wip-5073
39ba840 
rgw multitenancy

Buckets and users can now have a tenant associated with them. Buckets can be specified as [<tenant>:]<bucket> and users can be specified as [<tenant>$]<uid>. The existing users and buckets are part of the default global tenant.
This is first phase. Future work will add tighter integration (e.g., swift tenant mapping, s3 subdomain tenant mapping, etc.)

Reviewed-by: Pete Zaitcev <zaitcev@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa yehudasa merged commit 39ba840 into master Dec 3, 2015
@loic-bot
Copy link

loic-bot commented Dec 3, 2015

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/9791/

Vicente-Cheng added a commit to Vicente-Cheng/ceph that referenced this pull request Mar 15, 2016
@Vicente-Cheng
rgw: user quota may not adjust on bucket removal
cedc30f 
Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)
Backport: hammer

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some ret to op_ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
Vicente-Cheng added a commit to Vicente-Cheng/ceph that referenced this pull request Mar 15, 2016
@Vicente-Cheng
rgw: user quota may not adjust on bucket removal
5c5f206 
Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)
Backport: hammer

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
Vicente-Cheng added a commit to Vicente-Cheng/ceph that referenced this pull request Mar 17, 2016
@Vicente-Cheng
rgw: user quota may not adjust on bucket removal
aa8702d 
Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)
Backport: hammer

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
Vicente-Cheng pushed a commit to Vicente-Cheng/ceph that referenced this pull request Mar 19, 2016
@Vicente-Cheng
rgw:bucket link now set the bucket.instance acl
45c067b 
Fixes: ceph#11076

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
(cherry picked from commit 4d59b1d)
Backport: hammer

Conflicts:

	src/rgw/rgw_bucket.cc
	    remove the tenant parameter that describes as below

Backport Change:
We remove the `tenant` parameter because this feature is not introduced
on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
Vicente-Cheng pushed a commit to Vicente-Cheng/ceph that referenced this pull request Mar 19, 2016
@Vicente-Cheng
rgw:bucket link now set the bucket.instance acl
15b963f 
Fixes: ceph#11076

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
(cherry picked from commit 4d59b1d)
Backport: hammer

Conflicts:

	src/rgw/rgw_bucket.cc
            Do not use the rgw_user structure and remove
            the tenant parameter that describes as below

Backport Change:
We do not use the rgw_user structure and remove the `tenant` parameter
because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
Vicente-Cheng added a commit to Vicente-Cheng/ceph that referenced this pull request Apr 6, 2016
@Vicente-Cheng
Description:
c5766dd 
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.
Vicente-Cheng added a commit to Vicente-Cheng/ceph that referenced this pull request Apr 6, 2016
@Vicente-Cheng
rgw: user quota may not adjust on bucket removal
c722d00 
Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.
Vicente-Cheng pushed a commit to Vicente-Cheng/ceph that referenced this pull request Apr 13, 2016
@Vicente-Cheng
rgw:bucket link now set the bucket.instance acl
3c03eee 
Fixes: ceph#11076

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
(cherry picked from commit 4d59b1d)

Conflicts:

	src/rgw/rgw_bucket.cc
            1. Do not use the rgw_user structure and remove the tenant parameter that describes as below
            2. user_id is not used so just remove the line
            3. instead of system_obj_set_attr you can use the method set_attr

Backport Change:
We do not use the rgw_user structure and remove the `tenant` parameter
because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.
@liewegas liewegas deleted the wip-5073 branch November 23, 2016 20:12
Abhishekvrshny pushed a commit to Abhishekvrshny/ceph that referenced this pull request Jul 13, 2017
@Vicente-Cheng
rgw: user quota may not adjust on bucket removal
7826a06 
Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.
(cherry picked from commit c722d00)

Conflicts:
	src/rgw/rgw_op.cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@yehudasa yehudasa

Labels

feature rgw

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yehudasa @loic-bot @zaitcev