diff --git a/cmd/disk-cache.go b/cmd/disk-cache.go index 602d6f258..08d07b8e2 100644 --- a/cmd/disk-cache.go +++ b/cmd/disk-cache.go @@ -326,7 +326,9 @@ func (c *cacheObjects) GetObjectNInfo(ctx context.Context, bucket, object string // avoid cache overwrite if another background routine filled cache if err != nil || oi.ETag != bReader.ObjInfo.ETag { // use a new context to avoid locker prematurely timing out operation when the GetObjectNInfo returns. - dcache.Put(context.Background(), bucket, object, bReader, bReader.ObjInfo.Size, rs, ObjectOptions{UserDefined: getMetadata(bReader.ObjInfo)}, false) + dcache.Put(GlobalContext, bucket, object, bReader, bReader.ObjInfo.Size, rs, ObjectOptions{ + UserDefined: getMetadata(bReader.ObjInfo), + }, false) return } }() @@ -337,7 +339,11 @@ func (c *cacheObjects) GetObjectNInfo(ctx context.Context, bucket, object string pipeReader, pipeWriter := io.Pipe() teeReader := io.TeeReader(bkReader, pipeWriter) go func() { - putErr := dcache.Put(ctx, bucket, object, io.LimitReader(pipeReader, bkReader.ObjInfo.Size), bkReader.ObjInfo.Size, nil, ObjectOptions{UserDefined: getMetadata(bkReader.ObjInfo)}, false) + putErr := dcache.Put(ctx, bucket, object, + io.LimitReader(pipeReader, bkReader.ObjInfo.Size), + bkReader.ObjInfo.Size, nil, ObjectOptions{ + UserDefined: getMetadata(bkReader.ObjInfo), + }, false) // close the write end of the pipe, so the error gets // propagated to getObjReader pipeWriter.CloseWithError(putErr) diff --git a/cmd/iam-object-store.go b/cmd/iam-object-store.go index 03cb09ef3..a5c4d55d0 100644 --- a/cmd/iam-object-store.go +++ b/cmd/iam-object-store.go @@ -151,7 +151,7 @@ func (iamOS *IAMObjectStore) migrateUsersConfigToV1(ctx context.Context, isSTS b cred.AccessKey = user u := newUserIdentity(cred) if err := iamOS.saveIAMConfig(u, identityPath); err != nil { - logger.LogIf(context.Background(), err) + logger.LogIf(ctx, err) return err } @@ -216,7 +216,7 @@ func (iamOS *IAMObjectStore) saveIAMConfig(item interface{}, path string) error return err } } - return saveConfig(context.Background(), iamOS.objAPI, path, data) + return saveConfig(GlobalContext, iamOS.objAPI, path, data) } func (iamOS *IAMObjectStore) loadIAMConfig(item interface{}, path string) error { @@ -586,7 +586,7 @@ func listIAMConfigItems(ctx context.Context, objAPI ObjectLayer, pathPrefix stri marker := "" for { - lo, err := objAPI.ListObjects(context.Background(), + lo, err := objAPI.ListObjects(ctx, minioMetaBucket, pathPrefix, marker, SlashSeparator, maxObjectList) if err != nil { select { diff --git a/cmd/iam.go b/cmd/iam.go index 63cd609f9..9805eccdd 100644 --- a/cmd/iam.go +++ b/cmd/iam.go @@ -1640,7 +1640,7 @@ func (sys *IAMSys) IsAllowedServiceAccount(args iampolicy.Args, parent string) b subPolicy, err := iampolicy.ParseConfig(bytes.NewReader([]byte(spolicyStr))) if err != nil { // Log any error in input session policy config. - logger.LogIf(context.Background(), err) + logger.LogIf(GlobalContext, err) return false } @@ -1783,7 +1783,7 @@ func (sys *IAMSys) IsAllowedSTS(args iampolicy.Args) bool { subPolicy, err := iampolicy.ParseConfig(bytes.NewReader([]byte(spolicyStr))) if err != nil { // Log any error in input session policy config. - logger.LogIf(context.Background(), err) + logger.LogIf(GlobalContext, err) return false } @@ -1807,7 +1807,7 @@ func (sys *IAMSys) IsAllowed(args iampolicy.Args) bool { if globalPolicyOPA != nil { ok, err := globalPolicyOPA.IsAllowed(args) if err != nil { - logger.LogIf(context.Background(), err) + logger.LogIf(GlobalContext, err) } return ok } diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go index 319348849..0fda3f460 100644 --- a/cmd/object-handlers.go +++ b/cmd/object-handlers.go @@ -1261,7 +1261,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re response := generateCopyObjectResponse(objInfo.ETag, objInfo.ModTime) encodedSuccessResponse := encodeResponse(response) if mustReplicate(ctx, r, dstBucket, dstObject, objInfo.UserDefined, objInfo.ReplicationStatus.String()) { - defer replicateObject(context.Background(), dstBucket, dstObject, objInfo.VersionID, objectAPI, &eventArgs{ + defer replicateObject(GlobalContext, dstBucket, dstObject, objInfo.VersionID, objectAPI, &eventArgs{ EventName: event.ObjectCreatedCopy, BucketName: dstBucket, Object: objInfo, @@ -1577,7 +1577,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req } } if mustReplicate(ctx, r, bucket, object, metadata, "") { - defer replicateObject(context.Background(), bucket, object, objInfo.VersionID, objectAPI, &eventArgs{ + defer replicateObject(GlobalContext, bucket, object, objInfo.VersionID, objectAPI, &eventArgs{ EventName: event.ObjectCreatedPut, BucketName: bucket, Object: objInfo, @@ -2652,7 +2652,7 @@ func (api objectAPIHandlers) CompleteMultipartUploadHandler(w http.ResponseWrite setPutObjHeaders(w, objInfo, false) if mustReplicate(ctx, r, bucket, object, objInfo.UserDefined, objInfo.ReplicationStatus.String()) { - defer replicateObject(context.Background(), bucket, object, objInfo.VersionID, objectAPI, &eventArgs{ + defer replicateObject(GlobalContext, bucket, object, objInfo.VersionID, objectAPI, &eventArgs{ EventName: event.ObjectCreatedCompleteMultipartUpload, BucketName: bucket, Object: objInfo, diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go index 3dfaf0242..1148b4be4 100644 --- a/cmd/peer-rest-server.go +++ b/cmd/peer-rest-server.go @@ -182,7 +182,7 @@ func (s *peerRESTServer) DeleteServiceAccountHandler(w http.ResponseWriter, r *h return } - if err := globalIAMSys.DeleteServiceAccount(context.Background(), accessKey); err != nil { + if err := globalIAMSys.DeleteServiceAccount(r.Context(), accessKey); err != nil { s.writeErrorResponse(w, err) return } diff --git a/cmd/storage-rest-client.go b/cmd/storage-rest-client.go index 3402895c9..80ccef71e 100644 --- a/cmd/storage-rest-client.go +++ b/cmd/storage-rest-client.go @@ -478,7 +478,7 @@ func (client *storageRESTClient) WalkVersions(volume, dirPath, marker string, re if gerr := decoder.Decode(&fi); gerr != nil { // Upon error return if gerr != io.EOF { - logger.LogIf(context.Background(), gerr) + logger.LogIf(GlobalContext, gerr) } return } diff --git a/cmd/web-handlers.go b/cmd/web-handlers.go index 994da4304..fe9f98efc 100644 --- a/cmd/web-handlers.go +++ b/cmd/web-handlers.go @@ -1173,7 +1173,7 @@ func (web *webAPIHandlers) Upload(w http.ResponseWriter, r *http.Request) { } } if mustReplicate { - defer replicateObject(context.Background(), bucket, object, objInfo.VersionID, objectAPI, &eventArgs{ + defer replicateObject(GlobalContext, bucket, object, objInfo.VersionID, objectAPI, &eventArgs{ EventName: event.ObjectCreatedPut, BucketName: bucket, Object: objInfo,