feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #5730 from leseb/fix-get-user

Browse Source 
ceph: fix GetUser
This commit is contained in:
Sébastien Han
2020-06-29 18:04:17 +02:00
committed by GitHub
parent c37d8c9c2a 1efd490900
commit a246b157f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/object/user.go
+3 -3
View File
@@ -92,11 +92,11 @@ func GetUser(c *Context, id string) (*ObjectUser, int, error) {
// note: err is set for non-existent user but result output is also empty
result, err := runAdminCommand(c, "user", "info", "--uid", id)
if len(result) == 0 {
return nil, RGWErrorNotFound, errors.New("warn: user not found")
if strings.Contains(result, "no user info saved") {
return nil, RGWErrorNotFound, errors.New("warn: s3 user not found")
}
if err != nil {
return nil, RGWErrorUnknown, errors.Wrap(err, "radosgw-admin command err")
return nil, RGWErrorUnknown, errors.Wrapf(err, "radosgw-admin command err. %s", result)
}
return decodeUser(result)
}