ceph: remove rgwerrno from setuserquota
Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
This commit is contained in:
1 parent
22ba4591f3
commit
cf61966205
2 files changed
+9
-9
No files matched your search
@@ -94,8 +94,8 @@ func (p Provisioner) Provision(options *apibkt.BucketOptions) (*bktv1alpha1.Obje
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_, errCode, err := cephObject.SetQuotaUserBucketMax(p.objectContext, p.cephUserName, maxBuckets)
|
||||
if errCode > 0 {
|
||||
_, err = cephObject.SetQuotaUserBucketMax(p.objectContext, p.cephUserName, maxBuckets)
|
||||
if err != nil {
|
||||
p.deleteOBCResourceLogError(p.bucketName)
|
||||
return nil, err
|
||||
}
|
||||
@@ -127,7 +127,7 @@ func (p Provisioner) Grant(options *apibkt.BucketOptions) (*bktv1alpha1.ObjectBu
|
||||
}
|
||||
|
||||
// need to quota into -1 for restricting creation of new buckets in rgw
|
||||
_, _, err = cephObject.SetQuotaUserBucketMax(p.objectContext, p.cephUserName, -1)
|
||||
_, err = cephObject.SetQuotaUserBucketMax(p.objectContext, p.cephUserName, -1)
|
||||
if err != nil {
|
||||
p.deleteOBCResourceLogError("")
|
||||
return nil, err
|
||||
|
||||
@@ -183,23 +183,23 @@ func DeleteUser(c *Context, id string, opts ...string) (string, error) {
|
||||
return result, errors.Wrap(err, "failed to delete s3 user")
|
||||
}
|
||||
|
||||
func SetQuotaUserBucketMax(c *Context, id string, max int) (string, int, error) {
|
||||
func SetQuotaUserBucketMax(c *Context, id string, max int) (string, error) {
|
||||
logger.Infof("Setting user %q max buckets to %d", id, max)
|
||||
args := []string{"--quota-scope", "user", "--max-buckets", strconv.Itoa(max)}
|
||||
result, errCode, err := setUserQuota(c, id, args)
|
||||
if errCode != RGWErrorNone {
|
||||
result, err := setUserQuota(c, id, args)
|
||||
if err != nil {
|
||||
err = errors.Wrap(err, "failed setting bucket max")
|
||||
}
|
||||
return result, errCode, err
|
||||
return result, err
|
||||
}
|
||||
|
||||
func setUserQuota(c *Context, id string, args []string) (string, int, error) {
|
||||
func setUserQuota(c *Context, id string, args []string) (string, error) {
|
||||
args = append([]string{"quota", "set", "--uid", id}, args...)
|
||||
result, err := runAdminCommand(c, args...)
|
||||
if err != nil {
|
||||
err = errors.Wrap(err, "failed to set max buckets for user")
|
||||
}
|
||||
return result, RGWErrorNone, err
|
||||
return result, err
|
||||
}
|
||||
|
||||
func LinkUser(c *Context, id, bucket string) (string, int, error) {
|
||||
|
||||
Reference in new issue
Block a user