infrastructure/k8s-csi-s3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Improve bucket error messages

Browse source
This commit is contained in:
Cyrill Troxler 2019-01-19 14:39:33 +01:00
parent 6989c5b01f
commit d8f966a3de
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/s3/controllerserver.go
View file

@ -57,13 +57,13 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
exists, err := cs.s3.client.bucketExists(volumeID) exists, err := cs.s3.client.bucketExists(volumeID)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to check if bucket exists: %v", err) return nil, fmt.Errorf("failed to check if bucket %s exists: %v", volumeID, err)
} }
if exists { if exists {
var b *bucket var b *bucket
b, err = cs.s3.client.getBucket(volumeID) b, err = cs.s3.client.getBucket(volumeID)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get bucket metadata: %v", err) return nil, fmt.Errorf("failed to get bucket metadata of bucket %s: %v", volumeID, err)
} }
// Check if volume capacity requested is bigger than the already existing capacity // Check if volume capacity requested is bigger than the already existing capacity
if capacityBytes > b.CapacityBytes { if capacityBytes > b.CapacityBytes {
@ -71,10 +71,10 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
} }
} else { } else {
if err = cs.s3.client.createBucket(volumeID); err != nil { if err = cs.s3.client.createBucket(volumeID); err != nil {
return nil, fmt.Errorf("failed to create volume: %v", err) return nil, fmt.Errorf("failed to create volume %s: %v", volumeID, err)
} }
if err = cs.s3.client.createPrefix(volumeID, fsPrefix); err != nil { if err = cs.s3.client.createPrefix(volumeID, fsPrefix); err != nil {
return nil, fmt.Errorf("failed to create prefix: %v", err) return nil, fmt.Errorf("failed to create prefix %s: %v", fsPrefix, err)
} }
} }
b := &bucket{ b := &bucket{