Allow bucket creation in different regions, closes #4287 and #4241

* I needed to remove the region check from PutBucketHandler
master
Remco Verhoef 8 years ago committed by Harshavardhana
parent 8085ba4494
commit d86973dcca
  1. 5
      cmd/gateway-gcs.go
  2. 9
      cmd/gateway-handlers.go

@ -229,11 +229,6 @@ func (l *gcsGateway) MakeBucket(bucket string) error {
func (l *gcsGateway) MakeBucketWithLocation(bucket, location string) error { func (l *gcsGateway) MakeBucketWithLocation(bucket, location string) error {
bkt := l.client.Bucket(bucket) bkt := l.client.Bucket(bucket)
// we'll default to the us multi-region in case of us-east-1
if location == "us-east-1" {
location = "us"
}
if err := bkt.Create(l.ctx, l.projectID, &storage.BucketAttrs{ if err := bkt.Create(l.ctx, l.projectID, &storage.BucketAttrs{
Location: location, Location: location,
}); err != nil { }); err != nil {

@ -653,15 +653,6 @@ func (api gatewayAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Re
return return
} }
// validating region here, because isValidLocationConstraint
// reads body which has been read already. So only validating
// region here.
serverRegion := serverConfig.GetRegion()
if serverRegion != "" && serverRegion != location {
writeErrorResponse(w, ErrInvalidRegion, r.URL)
return
}
bucketLock := globalNSMutex.NewNSLock(bucket, "") bucketLock := globalNSMutex.NewNSLock(bucket, "")
bucketLock.Lock() bucketLock.Lock()
defer bucketLock.Unlock() defer bucketLock.Unlock()

Loading…
Cancel
Save