Fix build failure due to nats project migration

Fixes #7741

browser/yarn.lock

@@ -3364,9 +3364,9 @@ fstream-ignore@^1.0.5:
     minimatch "^3.0.0"
 
 fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -3482,7 +3482,7 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.3:
+glob@^7.0.3, glob@^7.0.5:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -3494,6 +3494,18 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.3:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules-path@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931"
@@ -3546,11 +3558,7 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.4:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-graceful-fs@^4.1.15, graceful-fs@^4.1.2:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -5970,6 +5978,7 @@ on-headers@~1.0.1:
 once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
@@ -7397,19 +7406,13 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.5.4:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"

cmd/gateway-main.go

@@ -304,6 +304,9 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
 		printGatewayStartupMessage(getAPIEndpoints(), gatewayName)
 	}
 
+	// Set when gateway is enabled
+	globalIsGateway = true
+
 	// Set uptime time after object layer has initialized.
 	globalBootTime = UTCNow()
 

cmd/globals.go

@@ -82,8 +82,6 @@ const (
 	// GlobalMultipartCleanupInterval - Cleanup interval when the stale multipart cleanup is initiated.
 	GlobalMultipartCleanupInterval = time.Hour * 24 // 24 hrs.
 
-	// Refresh interval to update in-memory bucket policy cache.
-	globalRefreshBucketPolicyInterval = 5 * time.Minute
 	// Refresh interval to update in-memory iam config cache.
 	globalRefreshIAMInterval = 5 * time.Minute
 
@@ -111,6 +109,9 @@ var (
 	// Indicates if the running minio server is an erasure-code backend.
 	globalIsXL = false
 
+	// Indicates if the running minio is in gateway mode.
+	globalIsGateway = false
+
 	// This flag is set to 'true' by default
 	globalIsBrowserEnabled = true
 

cmd/logger/target/console/console.go

@@ -74,6 +74,11 @@ func (c *Target) Send(e interface{}) error {
 	apiString += ")"
 	timeString := "Time: " + time.Now().Format(logger.TimeFormat)
 
+	var deploymentID string
+	if entry.DeploymentID != "" {
+		deploymentID = "\nDeploymentID: " + entry.DeploymentID
+	}
+
 	var requestID string
 	if entry.RequestID != "" {
 		requestID = "\nRequestID: " + entry.RequestID
@@ -94,8 +99,8 @@ func (c *Target) Send(e interface{}) error {
 	}
 
 	var msg = logger.ColorFgRed(logger.ColorBold(entry.Trace.Message))
-	var output = fmt.Sprintf("\n%s\n%s%s%s%s\nError: %s%s\n%s",
-		apiString, timeString, requestID, remoteHost, userAgent,
+	var output = fmt.Sprintf("\n%s\n%s%s%s%s%s\nError: %s%s\n%s",
+		apiString, timeString, deploymentID, requestID, remoteHost, userAgent,
 		msg, tagString, strings.Join(trace, "\n"))
 
 	fmt.Println(output)

cmd/policy.go

@@ -25,7 +25,6 @@ import (
 	"path"
 	"strings"
 	"sync"
-	"time"
 
 	miniogopolicy "github.com/minio/minio-go/v6/pkg/policy"
 	"github.com/minio/minio-go/v6/pkg/set"
@@ -61,6 +60,11 @@ func (sys *PolicySys) removeDeletedBuckets(bucketInfos []BucketInfo) {
 
 // Set - sets policy to given bucket name.  If policy is empty, existing policy is removed.
 func (sys *PolicySys) Set(bucketName string, policy policy.Policy) {
+	if globalIsGateway {
+		// Set policy is a non-op under gateway mode.
+		return
+	}
+
 	sys.Lock()
 	defer sys.Unlock()
 
@@ -84,9 +88,21 @@ func (sys *PolicySys) IsAllowed(args policy.Args) bool {
 	sys.RLock()
 	defer sys.RUnlock()
 
-	// If policy is available for given bucket, check the policy.
-	if p, found := sys.bucketPolicyMap[args.BucketName]; found {
-		return p.IsAllowed(args)
+	if globalIsGateway {
+		// When gateway is enabled, no cached value
+		// is used to validate bucket policies.
+		objAPI := newObjectLayerFn()
+		if objAPI != nil {
+			config, err := objAPI.GetBucketPolicy(context.Background(), args.BucketName)
+			if err == nil {
+				return config.IsAllowed(args)
+			}
+		}
+	} else {
+		// If policy is available for given bucket, check the policy.
+		if p, found := sys.bucketPolicyMap[args.BucketName]; found {
+			return p.IsAllowed(args)
+		}
 	}
 
 	// As policy is not available for given bucket name, returns IsOwner i.e.
@@ -135,21 +151,11 @@ func (sys *PolicySys) Init(objAPI ObjectLayer) error {
 		return errInvalidArgument
 	}
 
-	defer func() {
-		// Refresh PolicySys in background.
-		go func() {
-			ticker := time.NewTicker(globalRefreshBucketPolicyInterval)
-			defer ticker.Stop()
-			for {
-				select {
-				case <-GlobalServiceDoneCh:
-					return
-				case <-ticker.C:
-					sys.refresh(objAPI)
-				}
-			}
-		}()
-	}()
+	// In gateway mode, we don't need to load the policies
+	// from the backend.
+	if globalIsGateway {
+		return nil
+	}
 
 	doneCh := make(chan struct{})
 	defer close(doneCh)

cmd/web-handlers.go

@@ -73,11 +73,34 @@ type ServerInfoRep struct {
 	UIVersion       string `json:"uiVersion"`
 }
 
+// newWebContext creates a context with ReqInfo values from the given
+// http request and api name.
+func newWebContext(r *http.Request, api string) context.Context {
+	vars := mux.Vars(r)
+	bucket := vars["bucket"]
+	object := vars["object"]
+	prefix := vars["prefix"]
+
+	if prefix != "" {
+		object = prefix
+	}
+	reqInfo := &logger.ReqInfo{
+		DeploymentID: globalDeploymentID,
+		RemoteHost:   handlers.GetSourceIP(r),
+		UserAgent:    r.UserAgent(),
+		API:          api,
+		BucketName:   bucket,
+		ObjectName:   object,
+	}
+	return logger.SetReqInfo(context.Background(), reqInfo)
+}
+
 // ServerInfo - get server info.
 func (web *webAPIHandlers) ServerInfo(r *http.Request, args *WebGenericArgs, reply *ServerInfoRep) error {
+	ctx := newWebContext(r, "webServerInfo")
 	_, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 	host, err := os.Hostname()
 	if err != nil {
@@ -124,15 +147,16 @@ type StorageInfoRep struct {
 
 // StorageInfo - web call to gather storage usage statistics.
 func (web *webAPIHandlers) StorageInfo(r *http.Request, args *WebGenericArgs, reply *StorageInfoRep) error {
+	ctx := newWebContext(r, "webStorageInfo")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 	_, _, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
-	reply.StorageInfo = objectAPI.StorageInfo(context.Background())
+	reply.StorageInfo = objectAPI.StorageInfo(ctx)
 	reply.UIVersion = browser.UIVersion
 	return nil
 }
@@ -144,13 +168,14 @@ type MakeBucketArgs struct {
 
 // MakeBucket - creates a new bucket.
 func (web *webAPIHandlers) MakeBucket(r *http.Request, args *MakeBucketArgs, reply *WebGenericRep) error {
+	ctx := newWebContext(r, "webMakeBucket")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	// For authenticated users apply IAM policy.
@@ -161,36 +186,36 @@ func (web *webAPIHandlers) MakeBucket(r *http.Request, args *MakeBucketArgs, rep
 		ConditionValues: getConditionValues(r, "", claims.Subject),
 		IsOwner:         owner,
 	}) {
-		return toJSONError(errAccessDenied)
+		return toJSONError(ctx, errAccessDenied)
 	}
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, true) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	if globalDNSConfig != nil {
 		if _, err := globalDNSConfig.Get(args.BucketName); err != nil {
 			if err == dns.ErrNoEntriesFound {
 				// Proceed to creating a bucket.
-				if err = objectAPI.MakeBucketWithLocation(context.Background(), args.BucketName, globalServerConfig.GetRegion()); err != nil {
-					return toJSONError(err)
+				if err = objectAPI.MakeBucketWithLocation(ctx, args.BucketName, globalServerConfig.GetRegion()); err != nil {
+					return toJSONError(ctx, err)
 				}
 				if err = globalDNSConfig.Put(args.BucketName); err != nil {
-					objectAPI.DeleteBucket(context.Background(), args.BucketName)
-					return toJSONError(err)
+					objectAPI.DeleteBucket(ctx, args.BucketName)
+					return toJSONError(ctx, err)
 				}
 
 				reply.UIVersion = browser.UIVersion
 				return nil
 			}
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
-		return toJSONError(errBucketAlreadyExists)
+		return toJSONError(ctx, errBucketAlreadyExists)
 	}
 
-	if err := objectAPI.MakeBucketWithLocation(context.Background(), args.BucketName, globalServerConfig.GetRegion()); err != nil {
-		return toJSONError(err, args.BucketName)
+	if err := objectAPI.MakeBucketWithLocation(ctx, args.BucketName, globalServerConfig.GetRegion()); err != nil {
+		return toJSONError(ctx, err, args.BucketName)
 	}
 
 	reply.UIVersion = browser.UIVersion
@@ -204,13 +229,14 @@ type RemoveBucketArgs struct {
 
 // DeleteBucket - removes a bucket, must be empty.
 func (web *webAPIHandlers) DeleteBucket(r *http.Request, args *RemoveBucketArgs, reply *WebGenericRep) error {
+	ctx := newWebContext(r, "webDeleteBucket")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	// For authenticated users apply IAM policy.
@@ -221,45 +247,43 @@ func (web *webAPIHandlers) DeleteBucket(r *http.Request, args *RemoveBucketArgs,
 		ConditionValues: getConditionValues(r, "", claims.Subject),
 		IsOwner:         owner,
 	}) {
-		return toJSONError(errAccessDenied)
+		return toJSONError(ctx, errAccessDenied)
 	}
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	reply.UIVersion = browser.UIVersion
 
-	if isRemoteCallRequired(context.Background(), args.BucketName, objectAPI) {
+	if isRemoteCallRequired(ctx, args.BucketName, objectAPI) {
 		sr, err := globalDNSConfig.Get(args.BucketName)
 		if err != nil {
 			if err == dns.ErrNoEntriesFound {
-				return toJSONError(BucketNotFound{
+				return toJSONError(ctx, BucketNotFound{
 					Bucket: args.BucketName,
 				}, args.BucketName)
 			}
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		core, err := getRemoteInstanceClient(r, getHostFromSrv(sr))
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		if err = core.RemoveBucket(args.BucketName); err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		return nil
 	}
 
-	ctx := context.Background()
-
 	deleteBucket := objectAPI.DeleteBucket
 	if web.CacheAPI() != nil {
 		deleteBucket = web.CacheAPI().DeleteBucket
 	}
 
 	if err := deleteBucket(ctx, args.BucketName); err != nil {
-		return toJSONError(err, args.BucketName)
+		return toJSONError(ctx, err, args.BucketName)
 	}
 
 	globalNotificationSys.RemoveNotification(args.BucketName)
@@ -270,7 +294,7 @@ func (web *webAPIHandlers) DeleteBucket(r *http.Request, args *RemoveBucketArgs,
 		if err := globalDNSConfig.Delete(args.BucketName); err != nil {
 			// Deleting DNS entry failed, attempt to create the bucket again.
 			objectAPI.MakeBucketWithLocation(ctx, args.BucketName, "")
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 	}
 
@@ -293,9 +317,10 @@ type WebBucketInfo struct {
 
 // ListBuckets - list buckets api.
 func (web *webAPIHandlers) ListBuckets(r *http.Request, args *WebGenericArgs, reply *ListBucketsRep) error {
+	ctx := newWebContext(r, "webListBuckets")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 	listBuckets := objectAPI.ListBuckets
 	if web.CacheAPI() != nil {
@@ -304,7 +329,7 @@ func (web *webAPIHandlers) ListBuckets(r *http.Request, args *WebGenericArgs, re
 
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	// Set prefix value for "s3:prefix" policy conditionals.
@@ -317,7 +342,7 @@ func (web *webAPIHandlers) ListBuckets(r *http.Request, args *WebGenericArgs, re
 	if globalDNSConfig != nil {
 		dnsBuckets, err := globalDNSConfig.List()
 		if err != nil && err != dns.ErrNoEntriesFound {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 		bucketSet := set.NewStringSet()
 		for _, dnsRecord := range dnsBuckets {
@@ -342,9 +367,9 @@ func (web *webAPIHandlers) ListBuckets(r *http.Request, args *WebGenericArgs, re
 			}
 		}
 	} else {
-		buckets, err := listBuckets(context.Background())
+		buckets, err := listBuckets(ctx)
 		if err != nil {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 		for _, bucket := range buckets {
 			if globalIAMSys.IsAllowed(iampolicy.Args{
@@ -397,10 +422,11 @@ type WebObjectInfo struct {
 
 // ListObjects - list objects api.
 func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, reply *ListObjectsRep) error {
+	ctx := newWebContext(r, "webListObjects")
 	reply.UIVersion = browser.UIVersion
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 
 	listObjects := objectAPI.ListObjects
@@ -408,23 +434,23 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
 		listObjects = web.CacheAPI().ListObjects
 	}
 
-	if isRemoteCallRequired(context.Background(), args.BucketName, objectAPI) {
+	if isRemoteCallRequired(ctx, args.BucketName, objectAPI) {
 		sr, err := globalDNSConfig.Get(args.BucketName)
 		if err != nil {
 			if err == dns.ErrNoEntriesFound {
-				return toJSONError(BucketNotFound{
+				return toJSONError(ctx, BucketNotFound{
 					Bucket: args.BucketName,
 				}, args.BucketName)
 			}
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		core, err := getRemoteInstanceClient(r, getHostFromSrv(sr))
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		result, err := core.ListObjects(args.BucketName, args.Prefix, args.Marker, slashSeparator, 1000)
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		reply.NextMarker = result.NextMarker
 		reply.IsTruncated = result.IsTruncated
@@ -480,7 +506,7 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
 				return nil
 			}
 		} else {
-			return toJSONError(authErr)
+			return toJSONError(ctx, authErr)
 		}
 	}
 
@@ -522,10 +548,10 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
-	lo, err := listObjects(context.Background(), args.BucketName, args.Prefix, args.Marker, slashSeparator, 1000)
+	lo, err := listObjects(ctx, args.BucketName, args.Prefix, args.Marker, slashSeparator, 1000)
 	if err != nil {
 		return &json2.Error{Message: err.Error()}
 	}
@@ -533,7 +559,7 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
 		if crypto.IsEncrypted(lo.Objects[i].UserDefined) {
 			lo.Objects[i].Size, err = lo.Objects[i].DecryptedSize()
 			if err != nil {
-				return toJSONError(err)
+				return toJSONError(ctx, err)
 			}
 		}
 	}
@@ -573,9 +599,10 @@ type RemoveObjectArgs struct {
 
 // RemoveObject - removes an object, or all the objects at a given prefix.
 func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs, reply *WebGenericRep) error {
+	ctx := newWebContext(r, "webRemoveObject")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 	listObjects := objectAPI.ListObjects
 	if web.CacheAPI() != nil {
@@ -594,37 +621,37 @@ func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs,
 					IsOwner:         false,
 					ObjectName:      object,
 				}) {
-					return toJSONError(errAuthentication)
+					return toJSONError(ctx, errAuthentication)
 				}
 			}
 		} else {
-			return toJSONError(authErr)
+			return toJSONError(ctx, authErr)
 		}
 	}
 
 	if args.BucketName == "" || len(args.Objects) == 0 {
-		return toJSONError(errInvalidArgument)
+		return toJSONError(ctx, errInvalidArgument)
 	}
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	reply.UIVersion = browser.UIVersion
-	if isRemoteCallRequired(context.Background(), args.BucketName, objectAPI) {
+	if isRemoteCallRequired(ctx, args.BucketName, objectAPI) {
 		sr, err := globalDNSConfig.Get(args.BucketName)
 		if err != nil {
 			if err == dns.ErrNoEntriesFound {
-				return toJSONError(BucketNotFound{
+				return toJSONError(ctx, BucketNotFound{
 					Bucket: args.BucketName,
 				}, args.BucketName)
 			}
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		core, err := getRemoteInstanceClient(r, getHostFromSrv(sr))
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		objectsCh := make(chan string)
 
@@ -639,7 +666,7 @@ func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs,
 
 		for resp := range core.RemoveObjects(args.BucketName, objectsCh) {
 			if resp.Err != nil {
-				return toJSONError(resp.Err, args.BucketName, resp.ObjectName)
+				return toJSONError(ctx, resp.Err, args.BucketName, resp.ObjectName)
 			}
 		}
 		return nil
@@ -652,8 +679,8 @@ next:
 		if !hasSuffix(objectName, slashSeparator) && objectName != "" {
 			// Deny if WORM is enabled
 			if globalWORMEnabled {
-				if _, err = objectAPI.GetObjectInfo(context.Background(), args.BucketName, objectName, ObjectOptions{}); err == nil {
-					return toJSONError(errMethodNotAllowed)
+				if _, err = objectAPI.GetObjectInfo(ctx, args.BucketName, objectName, ObjectOptions{}); err == nil {
+					return toJSONError(ctx, errMethodNotAllowed)
 				}
 			}
 			// Check for permissions only in the case of
@@ -668,11 +695,11 @@ next:
 					IsOwner:         owner,
 					ObjectName:      objectName,
 				}) {
-					return toJSONError(errAccessDenied)
+					return toJSONError(ctx, errAccessDenied)
 				}
 			}
 
-			if err = deleteObject(context.Background(), objectAPI, web.CacheAPI(), args.BucketName, objectName, r); err != nil {
+			if err = deleteObject(ctx, objectAPI, web.CacheAPI(), args.BucketName, objectName, r); err != nil {
 				break next
 			}
 			continue
@@ -686,20 +713,20 @@ next:
 			IsOwner:         owner,
 			ObjectName:      objectName,
 		}) {
-			return toJSONError(errAccessDenied)
+			return toJSONError(ctx, errAccessDenied)
 		}
 
 		// For directories, list the contents recursively and remove.
 		marker := ""
 		for {
 			var lo ListObjectsInfo
-			lo, err = listObjects(context.Background(), args.BucketName, objectName, marker, "", 1000)
+			lo, err = listObjects(ctx, args.BucketName, objectName, marker, "", 1000)
 			if err != nil {
 				break next
 			}
 			marker = lo.NextMarker
 			for _, obj := range lo.Objects {
-				err = deleteObject(context.Background(), objectAPI, web.CacheAPI(), args.BucketName, obj.Name, r)
+				err = deleteObject(ctx, objectAPI, web.CacheAPI(), args.BucketName, obj.Name, r)
 				if err != nil {
 					break next
 				}
@@ -712,7 +739,7 @@ next:
 
 	if err != nil && !isErrObjectNotFound(err) {
 		// Ignore object not found error.
-		return toJSONError(err, args.BucketName, "")
+		return toJSONError(ctx, err, args.BucketName, "")
 	}
 
 	return nil
@@ -732,9 +759,10 @@ type LoginRep struct {
 
 // Login - user login handler.
 func (web *webAPIHandlers) Login(r *http.Request, args *LoginArgs, reply *LoginRep) error {
+	ctx := newWebContext(r, "webLogin")
 	token, err := authenticateWeb(args.Username, args.Password)
 	if err != nil {
-		return toJSONError(err)
+		return toJSONError(ctx, err)
 	}
 
 	reply.Token = token
@@ -750,16 +778,17 @@ type GenerateAuthReply struct {
 }
 
 func (web webAPIHandlers) GenerateAuth(r *http.Request, args *WebGenericArgs, reply *GenerateAuthReply) error {
+	ctx := newWebContext(r, "webGenerateAuth")
 	_, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 	if !owner {
-		return toJSONError(errAccessDenied)
+		return toJSONError(ctx, errAccessDenied)
 	}
 	cred, err := auth.GetNewCredentials()
 	if err != nil {
-		return toJSONError(err)
+		return toJSONError(ctx, err)
 	}
 	reply.AccessKey = cred.AccessKey
 	reply.SecretKey = cred.SecretKey
@@ -784,19 +813,20 @@ type SetAuthReply struct {
 
 // SetAuth - Set accessKey and secretKey credentials.
 func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *SetAuthReply) error {
+	ctx := newWebContext(r, "webSetAuth")
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	// When WORM is enabled, disallow changing credenatials for owner and user
 	if globalWORMEnabled {
-		return toJSONError(errChangeCredNotAllowed)
+		return toJSONError(ctx, errChangeCredNotAllowed)
 	}
 
 	if owner {
 		if globalIsEnvCreds || globalEtcdClient != nil {
-			return toJSONError(errChangeCredNotAllowed)
+			return toJSONError(ctx, errChangeCredNotAllowed)
 		}
 
 		// get Current creds and verify
@@ -807,7 +837,7 @@ func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *Se
 
 		creds, err := auth.CreateCredentials(args.NewAccessKey, args.NewSecretKey)
 		if err != nil {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 
 		// Acquire lock before updating global configuration.
@@ -818,16 +848,16 @@ func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *Se
 		prevCred = globalServerConfig.SetCredential(creds)
 
 		// Persist updated credentials.
-		if err = saveServerConfig(context.Background(), newObjectLayerFn(), globalServerConfig); err != nil {
+		if err = saveServerConfig(ctx, newObjectLayerFn(), globalServerConfig); err != nil {
 			// Save the current creds when failed to update.
 			globalServerConfig.SetCredential(prevCred)
-			logger.LogIf(context.Background(), err)
-			return toJSONError(err)
+			logger.LogIf(ctx, err)
+			return toJSONError(ctx, err)
 		}
 
 		reply.Token, err = authenticateWeb(args.NewAccessKey, args.NewSecretKey)
 		if err != nil {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 	} else {
 		// for IAM users, access key cannot be updated
@@ -844,18 +874,19 @@ func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *Se
 
 		creds, err := auth.CreateCredentials(claims.Subject, args.NewSecretKey)
 		if err != nil {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 
 		err = globalIAMSys.SetUserSecretKey(creds.AccessKey, creds.SecretKey)
 		if err != nil {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
 
 		reply.Token, err = authenticateWeb(creds.AccessKey, creds.SecretKey)
 		if err != nil {
-			return toJSONError(err)
+			return toJSONError(ctx, err)
 		}
+
 	}
 
 	reply.UIVersion = browser.UIVersion
@@ -871,9 +902,10 @@ type URLTokenReply struct {
 
 // CreateURLToken creates a URL token (short-lived) for GET requests.
 func (web *webAPIHandlers) CreateURLToken(r *http.Request, args *WebGenericArgs, reply *URLTokenReply) error {
+	ctx := newWebContext(r, "webCreateURLToken")
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	creds := globalServerConfig.GetCredential()
@@ -881,13 +913,13 @@ func (web *webAPIHandlers) CreateURLToken(r *http.Request, args *WebGenericArgs,
 		var ok bool
 		creds, ok = globalIAMSys.GetUser(claims.Subject)
 		if !ok {
-			return toJSONError(errInvalidAccessKeyID)
+			return toJSONError(ctx, errInvalidAccessKeyID)
 		}
 	}
 
 	token, err := authenticateURL(creds.AccessKey, creds.SecretKey)
 	if err != nil {
-		return toJSONError(err)
+		return toJSONError(ctx, err)
 	}
 
 	reply.Token = token
@@ -963,7 +995,7 @@ func (web *webAPIHandlers) Upload(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Extract incoming metadata if any.
-	metadata, err := extractMetadata(context.Background(), r)
+	metadata, err := extractMetadata(ctx, r)
 	if err != nil {
 		writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r))
 		return
@@ -1041,7 +1073,7 @@ func (web *webAPIHandlers) Upload(w http.ResponseWriter, r *http.Request) {
 	if !hasServerSideEncryptionHeader(r.Header) && web.CacheAPI() != nil {
 		putObject = web.CacheAPI().PutObject
 	}
-	objInfo, err := putObject(context.Background(), bucket, object, pReader, opts)
+	objInfo, err := putObject(ctx, bucket, object, pReader, opts)
 	if err != nil {
 		writeWebErrorResponse(w, err)
 		return
@@ -1422,7 +1454,7 @@ func (web *webAPIHandlers) DownloadZip(w http.ResponseWriter, r *http.Request) {
 		// date to the response writer.
 		marker := ""
 		for {
-			lo, err := listObjects(context.Background(), args.BucketName, pathJoin(args.Prefix, object), marker, "", 1000)
+			lo, err := listObjects(ctx, args.BucketName, pathJoin(args.Prefix, object), marker, "", 1000)
 			if err != nil {
 				return
 			}
@@ -1454,14 +1486,15 @@ type GetBucketPolicyRep struct {
 
 // GetBucketPolicy - get bucket policy for the requested prefix.
 func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolicyArgs, reply *GetBucketPolicyRep) error {
+	ctx := newWebContext(r, "webGetBucketPolicy")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 	// For authenticated users apply IAM policy.
 	if !globalIAMSys.IsAllowed(iampolicy.Args{
@@ -1471,47 +1504,47 @@ func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolic
 		ConditionValues: getConditionValues(r, "", claims.Subject),
 		IsOwner:         owner,
 	}) {
-		return toJSONError(errAccessDenied)
+		return toJSONError(ctx, errAccessDenied)
 	}
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	var policyInfo = &miniogopolicy.BucketAccessPolicy{Version: "2012-10-17"}
-	if isRemoteCallRequired(context.Background(), args.BucketName, objectAPI) {
+	if isRemoteCallRequired(ctx, args.BucketName, objectAPI) {
 		sr, err := globalDNSConfig.Get(args.BucketName)
 		if err != nil {
 			if err == dns.ErrNoEntriesFound {
-				return toJSONError(BucketNotFound{
+				return toJSONError(ctx, BucketNotFound{
 					Bucket: args.BucketName,
 				}, args.BucketName)
 			}
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		client, rerr := getRemoteInstanceClient(r, getHostFromSrv(sr))
 		if rerr != nil {
-			return toJSONError(rerr, args.BucketName)
+			return toJSONError(ctx, rerr, args.BucketName)
 		}
 		policyStr, err := client.GetBucketPolicy(args.BucketName)
 		if err != nil {
-			return toJSONError(rerr, args.BucketName)
+			return toJSONError(ctx, rerr, args.BucketName)
 		}
 		bucketPolicy, err := policy.ParseConfig(strings.NewReader(policyStr), args.BucketName)
 		if err != nil {
-			return toJSONError(rerr, args.BucketName)
+			return toJSONError(ctx, rerr, args.BucketName)
 		}
 		policyInfo, err = PolicyToBucketAccessPolicy(bucketPolicy)
 		if err != nil {
 			// This should not happen.
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 	} else {
-		bucketPolicy, err := objectAPI.GetBucketPolicy(context.Background(), args.BucketName)
+		bucketPolicy, err := objectAPI.GetBucketPolicy(ctx, args.BucketName)
 		if err != nil {
 			if _, ok := err.(BucketPolicyNotFound); !ok {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 			return err
 		}
@@ -1519,7 +1552,7 @@ func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolic
 		policyInfo, err = PolicyToBucketAccessPolicy(bucketPolicy)
 		if err != nil {
 			// This should not happen.
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 	}
 
@@ -1549,60 +1582,61 @@ type ListAllBucketPoliciesRep struct {
 
 // ListAllBucketPolicies - get all bucket policy.
 func (web *webAPIHandlers) ListAllBucketPolicies(r *http.Request, args *ListAllBucketPoliciesArgs, reply *ListAllBucketPoliciesRep) error {
+	ctx := newWebContext(r, "WebListAllBucketPolicies")
 	objectAPI := web.ObjectAPI()
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 
 	_, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	if !owner {
-		return toJSONError(errAccessDenied)
+		return toJSONError(ctx, errAccessDenied)
 	}
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	var policyInfo = new(miniogopolicy.BucketAccessPolicy)
-	if isRemoteCallRequired(context.Background(), args.BucketName, objectAPI) {
+	if isRemoteCallRequired(ctx, args.BucketName, objectAPI) {
 		sr, err := globalDNSConfig.Get(args.BucketName)
 		if err != nil {
 			if err == dns.ErrNoEntriesFound {
-				return toJSONError(BucketNotFound{
+				return toJSONError(ctx, BucketNotFound{
 					Bucket: args.BucketName,
 				}, args.BucketName)
 			}
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		core, rerr := getRemoteInstanceClient(r, getHostFromSrv(sr))
 		if rerr != nil {
-			return toJSONError(rerr, args.BucketName)
+			return toJSONError(ctx, rerr, args.BucketName)
 		}
 		var policyStr string
 		policyStr, err = core.Client.GetBucketPolicy(args.BucketName)
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		if policyStr != "" {
 			if err = json.Unmarshal([]byte(policyStr), policyInfo); err != nil {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 		}
 	} else {
-		bucketPolicy, err := objectAPI.GetBucketPolicy(context.Background(), args.BucketName)
+		bucketPolicy, err := objectAPI.GetBucketPolicy(ctx, args.BucketName)
 		if err != nil {
 			if _, ok := err.(BucketPolicyNotFound); !ok {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 		}
 		policyInfo, err = PolicyToBucketAccessPolicy(bucketPolicy)
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 	}
 
@@ -1629,16 +1663,17 @@ type SetBucketPolicyWebArgs struct {
 
 // SetBucketPolicy - set bucket policy.
 func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolicyWebArgs, reply *WebGenericRep) error {
+	ctx := newWebContext(r, "webSetBucketPolicy")
 	objectAPI := web.ObjectAPI()
 	reply.UIVersion = browser.UIVersion
 
 	if objectAPI == nil {
-		return toJSONError(errServerNotInitialized)
+		return toJSONError(ctx, errServerNotInitialized)
 	}
 
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 
 	// For authenticated users apply IAM policy.
@@ -1649,12 +1684,12 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
 		ConditionValues: getConditionValues(r, "", claims.Subject),
 		IsOwner:         owner,
 	}) {
-		return toJSONError(errAccessDenied)
+		return toJSONError(ctx, errAccessDenied)
 	}
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	policyType := miniogopolicy.BucketPolicy(args.Policy)
@@ -1664,40 +1699,38 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
 		}
 	}
 
-	ctx := context.Background()
-
-	if isRemoteCallRequired(context.Background(), args.BucketName, objectAPI) {
+	if isRemoteCallRequired(ctx, args.BucketName, objectAPI) {
 		sr, err := globalDNSConfig.Get(args.BucketName)
 		if err != nil {
 			if err == dns.ErrNoEntriesFound {
-				return toJSONError(BucketNotFound{
+				return toJSONError(ctx, BucketNotFound{
 					Bucket: args.BucketName,
 				}, args.BucketName)
 			}
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		core, rerr := getRemoteInstanceClient(r, getHostFromSrv(sr))
 		if rerr != nil {
-			return toJSONError(rerr, args.BucketName)
+			return toJSONError(ctx, rerr, args.BucketName)
 		}
 		var policyStr string
 		// Use the abstracted API instead of core, such that
 		// NoSuchBucketPolicy errors are automatically handled.
 		policyStr, err = core.Client.GetBucketPolicy(args.BucketName)
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 		var policyInfo = &miniogopolicy.BucketAccessPolicy{Version: "2012-10-17"}
 		if policyStr != "" {
 			if err = json.Unmarshal([]byte(policyStr), policyInfo); err != nil {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 		}
 
 		policyInfo.Statements = miniogopolicy.SetPolicy(policyInfo.Statements, policyType, args.BucketName, args.Prefix)
 		if len(policyInfo.Statements) == 0 {
 			if err = core.SetBucketPolicy(args.BucketName, ""); err != nil {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 			return nil
 		}
@@ -1705,35 +1738,35 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
 		bucketPolicy, err := BucketAccessPolicyToPolicy(policyInfo)
 		if err != nil {
 			// This should not happen.
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 
 		policyData, err := json.Marshal(bucketPolicy)
 		if err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 
 		if err = core.SetBucketPolicy(args.BucketName, string(policyData)); err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 
 	} else {
 		bucketPolicy, err := objectAPI.GetBucketPolicy(ctx, args.BucketName)
 		if err != nil {
 			if _, ok := err.(BucketPolicyNotFound); !ok {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 		}
 		policyInfo, err := PolicyToBucketAccessPolicy(bucketPolicy)
 		if err != nil {
 			// This should not happen.
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 
 		policyInfo.Statements = miniogopolicy.SetPolicy(policyInfo.Statements, policyType, args.BucketName, args.Prefix)
 		if len(policyInfo.Statements) == 0 {
 			if err = objectAPI.DeleteBucketPolicy(ctx, args.BucketName); err != nil {
-				return toJSONError(err, args.BucketName)
+				return toJSONError(ctx, err, args.BucketName)
 			}
 
 			globalPolicySys.Remove(args.BucketName)
@@ -1743,12 +1776,12 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
 		bucketPolicy, err = BucketAccessPolicyToPolicy(policyInfo)
 		if err != nil {
 			// This should not happen.
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 
 		// Parse validate and save bucket policy.
 		if err := objectAPI.SetBucketPolicy(ctx, args.BucketName, bucketPolicy); err != nil {
-			return toJSONError(err, args.BucketName)
+			return toJSONError(ctx, err, args.BucketName)
 		}
 
 		globalPolicySys.Set(args.BucketName, *bucketPolicy)
@@ -1782,16 +1815,17 @@ type PresignedGetRep struct {
 
 // PresignedGET - returns presigned-Get url.
 func (web *webAPIHandlers) PresignedGet(r *http.Request, args *PresignedGetArgs, reply *PresignedGetRep) error {
+	ctx := newWebContext(r, "webPresignedGet")
 	claims, owner, authErr := webRequestAuthenticate(r)
 	if authErr != nil {
-		return toJSONError(authErr)
+		return toJSONError(ctx, authErr)
 	}
 	var creds auth.Credentials
 	if !owner {
 		var ok bool
 		creds, ok = globalIAMSys.GetUser(claims.Subject)
 		if !ok {
-			return toJSONError(errInvalidAccessKeyID)
+			return toJSONError(ctx, errInvalidAccessKeyID)
 		}
 	} else {
 		creds = globalServerConfig.GetCredential()
@@ -1806,7 +1840,7 @@ func (web *webAPIHandlers) PresignedGet(r *http.Request, args *PresignedGetArgs,
 
 	// Check if bucket is a reserved bucket name or invalid.
 	if isReservedOrInvalidBucket(args.BucketName, false) {
-		return toJSONError(errInvalidBucketName)
+		return toJSONError(ctx, errInvalidBucketName)
 	}
 
 	reply.UIVersion = browser.UIVersion
@@ -1852,8 +1886,8 @@ func presignedGet(host, bucket, object string, expiry int64, creds auth.Credenti
 
 // toJSONError converts regular errors into more user friendly
 // and consumable error message for the browser UI.
-func toJSONError(err error, params ...string) (jerr *json2.Error) {
-	apiErr := toWebAPIError(err)
+func toJSONError(ctx context.Context, err error, params ...string) (jerr *json2.Error) {
+	apiErr := toWebAPIError(ctx, err)
 	jerr = &json2.Error{
 		Message: apiErr.Description,
 	}
@@ -1892,7 +1926,7 @@ func toJSONError(err error, params ...string) (jerr *json2.Error) {
 }
 
 // toWebAPIError - convert into error into APIError.
-func toWebAPIError(err error) APIError {
+func toWebAPIError(ctx context.Context, err error) APIError {
 	switch err {
 	case errServerNotInitialized:
 		return APIError{
@@ -1973,7 +2007,7 @@ func toWebAPIError(err error) APIError {
 	}
 
 	// Log unexpected and unhandled errors.
-	logger.LogIf(context.Background(), err)
+	logger.LogIf(ctx, err)
 	return APIError{
 		Code:           "InternalError",
 		HTTPStatusCode: http.StatusInternalServerError,
@@ -1983,7 +2017,11 @@ func toWebAPIError(err error) APIError {
 
 // writeWebErrorResponse - set HTTP status code and write error description to the body.
 func writeWebErrorResponse(w http.ResponseWriter, err error) {
-	apiErr := toWebAPIError(err)
+	reqInfo := &logger.ReqInfo{
+		DeploymentID: globalDeploymentID,
+	}
+	ctx := logger.SetReqInfo(context.Background(), reqInfo)
+	apiErr := toWebAPIError(ctx, err)
 	w.WriteHeader(apiErr.HTTPStatusCode)
 	w.Write([]byte(apiErr.Description))
 }

docs/orchestration/docker-compose/docker-compose.yaml

@@ -5,7 +5,7 @@ version: '2'
 # 9001 through 9004.
 services:
  minio1:
-  image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+  image: minio/minio:RELEASE.2019-06-01T03-46-14Z
   volumes:
    - data1:/data
   ports:
@@ -15,7 +15,7 @@ services:
    MINIO_SECRET_KEY: minio123
   command: server http://minio1/data http://minio2/data http://minio3/data http://minio4/data 
  minio2:
-  image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+  image: minio/minio:RELEASE.2019-06-01T03-46-14Z
   volumes:
    - data2:/data
   ports:
@@ -25,7 +25,7 @@ services:
    MINIO_SECRET_KEY: minio123
   command: server http://minio1/data http://minio2/data http://minio3/data http://minio4/data 
  minio3:
-  image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+  image: minio/minio:RELEASE.2019-06-01T03-46-14Z
   volumes:
    - data3:/data
   ports:
@@ -35,7 +35,7 @@ services:
    MINIO_SECRET_KEY: minio123
   command: server http://minio1/data http://minio2/data http://minio3/data http://minio4/data 
  minio4:
-  image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+  image: minio/minio:RELEASE.2019-06-01T03-46-14Z
   volumes:
    - data4:/data
   ports:

docs/orchestration/docker-swarm/docker-compose-secrets.yaml

@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   minio1:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio1
     volumes:
       - minio1-data:/export
@@ -24,7 +24,7 @@ services:
       - access_key
 
   minio2:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio2
     volumes:
       - minio2-data:/export
@@ -46,7 +46,7 @@ services:
       - access_key
 
   minio3:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio3
     volumes:
       - minio3-data:/export
@@ -68,7 +68,7 @@ services:
       - access_key
 
   minio4:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio4
     volumes:
       - minio4-data:/export

docs/orchestration/docker-swarm/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   minio1:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio1
     volumes:
       - minio1-data:/export
@@ -24,7 +24,7 @@ services:
     command: server http://minio1/export http://minio2/export http://minio3/export http://minio4/export
 
   minio2:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio2
     volumes:
       - minio2-data:/export
@@ -46,7 +46,7 @@ services:
     command: server http://minio1/export http://minio2/export http://minio3/export http://minio4/export
 
   minio3:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio3
     volumes:
       - minio3-data:/export
@@ -68,7 +68,7 @@ services:
     command: server http://minio1/export http://minio2/export http://minio3/export http://minio4/export
 
   minio4:
-    image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+    image: minio/minio:RELEASE.2019-06-01T03-46-14Z
     hostname: minio4
     volumes:
       - minio4-data:/export

docs/orchestration/kubernetes/minio-distributed-daemonset.yaml

@@ -30,7 +30,7 @@ spec:
           value: "minio"
         - name: MINIO_SECRET_KEY
           value: "minio123"
-        image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+        image: minio/minio:RELEASE.2019-06-01T03-46-14Z
         # Unfortunately you must manually define each server. Perhaps autodiscovery via DNS can be implemented in the future.
         args:
         - server

docs/orchestration/kubernetes/minio-distributed-statefulset.yaml

@@ -21,7 +21,7 @@ spec:
           value: "minio"
         - name: MINIO_SECRET_KEY
           value: "minio123"
-        image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+        image: minio/minio:RELEASE.2019-06-01T03-46-14Z
         args:
         - server
         - http://minio-0.minio.default.svc.cluster.local/data

docs/orchestration/kubernetes/minio-gcs-gateway-deployment.yaml

@@ -21,7 +21,7 @@ spec:
       containers:
       - name: minio
         # Pulls the default Minio image from Docker Hub
-        image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+        image: minio/minio:RELEASE.2019-06-01T03-46-14Z
         args:
         - gateway
         - gcs

docs/orchestration/kubernetes/minio-standalone-deployment.yaml

@@ -29,7 +29,7 @@ spec:
         - name: data 
           mountPath: "/data"
         # Pulls the lastest Minio image from Docker Hub
-        image: minio/minio:RELEASE.2019-05-23T00-29-34Z
+        image: minio/minio:RELEASE.2019-06-01T03-46-14Z
         args:
         - server
         - /data

go.mod

@@ -66,6 +66,8 @@ require (
 	github.com/nats-io/go-nats-streaming v0.4.2
 	github.com/nats-io/nats v1.7.2
 	github.com/nats-io/nats-streaming-server v0.14.2 // indirect
+	github.com/nats-io/nats.go v1.8.0
+	github.com/nats-io/stan.go v0.4.5
 	github.com/ncw/directio v1.0.5
 	github.com/nsqio/go-nsq v1.0.7
 	github.com/pkg/profile v1.3.0
@@ -82,9 +84,11 @@ require (
 	github.com/tidwall/sjson v1.0.4
 	github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a
 	go.uber.org/atomic v1.3.2
-	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
+	golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5
+	golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
-	golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5
+	golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2
+	golang.org/x/tools v0.0.0-20190531223538-26e35f15edef // indirect
 	google.golang.org/api v0.4.0
 	gopkg.in/Shopify/sarama.v1 v1.20.0
 	gopkg.in/olivere/elastic.v5 v5.0.80

go.sum

@@ -465,26 +465,24 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/nats-io/gnatsd v1.4.1 h1:RconcfDeWpKCD6QIIwiVFcvForlXpWeJP7i5/lDLy44=
 github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ=
 github.com/nats-io/go-nats v0.0.0-20161120202126-6b6bf392d34d/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
-github.com/nats-io/go-nats v1.7.2 h1:cJujlwCYR8iMz5ofZSD/p2WLW8FabhkQ2lIEVbSvNSA=
 github.com/nats-io/go-nats v1.7.2/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
 github.com/nats-io/go-nats-streaming v0.0.0-20161216191029-077898146bfb/go.mod h1:gfq4R3c9sKAINOpelo0gn/b9QDMBZnmrttcsNF+lqyo=
-github.com/nats-io/go-nats-streaming v0.4.2 h1:e7Fs4yxvFTs8N5xKFoJyw0sVW2heJwYvrUWfdf9VQlE=
 github.com/nats-io/go-nats-streaming v0.4.2/go.mod h1:gfq4R3c9sKAINOpelo0gn/b9QDMBZnmrttcsNF+lqyo=
 github.com/nats-io/nats v0.0.0-20160916181735-70b70be17b77/go.mod h1:PpmYZwlgTfBI56QypJLfIMOfLnMRuVs+VL6r8mQ2SoQ=
-github.com/nats-io/nats v1.7.2 h1:8hasuHgNFiDGc7MTkGpPFc0v1Jz1nEoQwIHKAH2hFuo=
 github.com/nats-io/nats v1.7.2/go.mod h1:PpmYZwlgTfBI56QypJLfIMOfLnMRuVs+VL6r8mQ2SoQ=
-github.com/nats-io/nats-streaming-server v0.12.2 h1:EpyLfUBZgwu5c0mdSSytQsapm615AyitPssq7jgafdw=
 github.com/nats-io/nats-streaming-server v0.12.2/go.mod h1:RyqtDJZvMZO66YmyjIYdIvS69zu/wDAkyNWa8PIUa5c=
-github.com/nats-io/nats-streaming-server v0.14.1 h1:NLZNqluNLmsijog4x0VXofHGaSdAIH16Ge55maG5ItM=
 github.com/nats-io/nats-streaming-server v0.14.1/go.mod h1:RyqtDJZvMZO66YmyjIYdIvS69zu/wDAkyNWa8PIUa5c=
-github.com/nats-io/nats-streaming-server v0.14.2 h1:WjQMDqVOwsI0Nb0E+XmEs1LY17CwHRbTCSTWKhw9fXs=
 github.com/nats-io/nats-streaming-server v0.14.2/go.mod h1:RyqtDJZvMZO66YmyjIYdIvS69zu/wDAkyNWa8PIUa5c=
+github.com/nats-io/nats.go v1.8.0 h1:PXePcr71qzI9MMvQFfV0OBuNItkRQyyZowPfXzvdmVI=
+github.com/nats-io/nats.go v1.8.0/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
 github.com/nats-io/nkeys v0.0.2 h1:+qM7QpgXnvDDixitZtQUBDY9w/s9mu1ghS+JIbsrx6M=
 github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
 github.com/nats-io/nuid v1.0.0 h1:44QGdhbiANq8ZCbUkdn6W5bqtg+mHuDE4wOUuxxndFs=
 github.com/nats-io/nuid v1.0.0/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/nats-io/stan.go v0.4.5 h1:lPZ9y1jVGiXcTaUc1SnEIWPYfh0avuEiHBePNJYgpPk=
+github.com/nats-io/stan.go v0.4.5/go.mod h1:Ji7mK6gRZJSH1nc3ZJH6vi7zn/QnZhpR9Arm4iuzsUQ=
 github.com/ncw/directio v1.0.5 h1:JSUBhdjEvVaJvOoyPAbcW0fnd0tvRXD76wEfZ1KcQz4=
 github.com/ncw/directio v1.0.5/go.mod h1:rX/pKEYkOXBGOggmcyJeJGloCkleSvphPx2eV3t6ROk=
 github.com/nsqio/go-nsq v0.0.0-20181028195256-0527e80f3ba5/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito=
@@ -665,6 +663,8 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc=
+golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -673,6 +673,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -737,6 +739,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5 h1:f005F/Jl5JLP036x7QIvUVhNTqxvSYwFIiyOh2q12iU=
 golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 h1:T5DasATyLQfmbTpfEXx/IOL9vfjzW6up+ZDkmHvIf2s=
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -757,6 +761,8 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190318200714-bb1270c20edf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190531223538-26e35f15edef h1:tvvUBWZ5+WFnfcokh8TavIRxYRxUtmB+gQgCytJckhs=
+golang.org/x/tools v0.0.0-20190531223538-26e35f15edef/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 google.golang.org/api v0.0.0-20180603000442-8e296ef26005/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20180916000451-19ff8768a5c0/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=

pkg/dns/etcd_dns.go

@@ -56,7 +56,12 @@ func (c *coreDNS) List() ([]SrvRecord, error) {
 		if err != nil {
 			return nil, err
 		}
-		srvRecords = append(srvRecords, records...)
+		for _, record := range records {
+			if record.Key == "" {
+				continue
+			}
+			srvRecords = append(srvRecords, record)
+		}
 	}
 	return srvRecords, nil
 }
@@ -130,7 +135,7 @@ func (c *coreDNS) list(key string) ([]SrvRecord, error) {
 		// /skydns/net/miniocloud/10.0.0.1 that may exist as
 		// dns entry for the server (rather than the bucket
 		// itself).
-		if srvRecord.Key == "" || srvRecord.Key == etcdPathSeparator {
+		if srvRecord.Key == "" {
 			continue
 		}
 

pkg/event/target/nats.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/minio/minio/pkg/event"
 	xnet "github.com/minio/minio/pkg/net"
-	"github.com/nats-io/go-nats-streaming"
-	"github.com/nats-io/nats"
+	"github.com/nats-io/nats.go"
+	"github.com/nats-io/stan.go"
 )
 
 // NATSArgs - NATS target arguments.