History

Make sure to log unhandled errors always (#6784)

In many situations, while testing we encounter ErrInternalError, to reduce logging we have removed logging from quite a few places which is acceptable but when ErrInternalError occurs we should have a facility to log the corresponding error, this helps to debug Minio server.

Harshavardhana committed 8 years ago

Commit a55a2981 parent 2929c1818 files · +228 −225Browse files

Unified · Split

18 files
  1. cmd/acl-handlers.go +4 −4
  2. cmd/admin-handlers.go +66 −74
  3. cmd/admin-handlers_test.go +2 −2
  4. cmd/admin-heal-ops.go +9 −9
  5. cmd/api-errors.go +6 −1
  6. cmd/api-errors_test.go +3 −1
  7. cmd/api-response-multipart.go +5 −2
  8. cmd/auth-handler.go +8 −8
  9. cmd/auth-handler_test.go +7 −4
  10. cmd/bucket-handlers-listobjects.go +4 −4
  11. cmd/bucket-handlers.go +20 −20
  12. cmd/bucket-notification-handlers.go +16 −20
  13. cmd/bucket-policy-handlers.go +7 −8
  14. cmd/encryption-v1.go +1 −1
  15. cmd/generic-handlers.go +1 −1
  16. cmd/object-handlers.go +60 −60
  17. cmd/object-handlers_test.go +6 −4
  18. cmd/test-utils_test.go +3 −2
cmd/acl-handlers.go+4−4
@@ -78,7 +78,7 @@ func (api objectAPIHandlers) GetBucketACLHandler(w http.ResponseWriter, r *http. · 77 unmodified lines
7878 // Before proceeding validate if bucket exists.
7979 _, err := objAPI.GetBucketInfo(ctx, bucket)
8080 if err != nil {
81− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
81+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
8282 return
8383 }
8484
@@ -92,7 +92,7 @@ func (api objectAPIHandlers) GetBucketACLHandler(w http.ResponseWriter, r *http. · 7 unmodified lines
9292 Permission: "FULL_CONTROL",
9393 })
9494 if err := xml.NewEncoder(w).Encode(acl); err != nil {
95− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
95+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
9696 return
9797 }
9898
@@ -128,7 +128,7 @@ func (api objectAPIHandlers) GetObjectACLHandler(w http.ResponseWriter, r *http. · 29 unmodified lines
128128 // Before proceeding validate if object exists.
129129 _, err := objAPI.GetObjectInfo(ctx, bucket, object, ObjectOptions{})
130130 if err != nil {
131− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
131+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
132132 return
133133 }
134134
@@ -142,7 +142,7 @@ func (api objectAPIHandlers) GetObjectACLHandler(w http.ResponseWriter, r *http. · 7 unmodified lines
142142 Permission: "FULL_CONTROL",
143143 })
144144 if err := xml.NewEncoder(w).Encode(acl); err != nil {
145− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
145+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
146146 return
147147 }
148148
cmd/admin-handlers.go+66−74
@@ -71,7 +71,9 @@ var ( · 70 unmodified lines
7171 // -----------
7272 // Returns Administration API version
7373 func (a adminAPIHandlers) VersionHandler(w http.ResponseWriter, r *http.Request) {
74− adminAPIErr := checkAdminRequestAuthType(r, "")
74+ ctx := newContext(r, w, "Version")
75+
76+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
7577 if adminAPIErr != ErrNone {
7678 writeErrorResponseJSON(w, adminAPIErr, r.URL)
7779 return
@@ -79,8 +81,7 @@ func (a adminAPIHandlers) VersionHandler(w http.ResponseWriter, r *http.Request) · 1 unmodified line
7981
8082 jsonBytes, err := json.Marshal(adminAPIVersionInfo)
8183 if err != nil {
82− writeErrorResponseJSON(w, ErrInternalError, r.URL)
83− logger.LogIf(context.Background(), err)
84+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
8485 return
8586 }
8687
@@ -91,7 +92,9 @@ func (a adminAPIHandlers) VersionHandler(w http.ResponseWriter, r *http.Request) · 4 unmodified lines
9192 // ----------
9293 // Returns server version and uptime.
9394 func (a adminAPIHandlers) ServiceStatusHandler(w http.ResponseWriter, r *http.Request) {
94− adminAPIErr := checkAdminRequestAuthType(r, "")
95+ ctx := newContext(r, w, "ServiceStatus")
96+
97+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
9598 if adminAPIErr != ErrNone {
9699 writeErrorResponseJSON(w, adminAPIErr, r.URL)
97100 return
@@ -107,8 +110,7 @@ func (a adminAPIHandlers) ServiceStatusHandler(w http.ResponseWriter, r *http.Re · 9 unmodified lines
107110 // of read-quorum availability.
108111 uptime, err := getPeerUptimes(globalAdminPeers)
109112 if err != nil {
110− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
111− logger.LogIf(context.Background(), err)
113+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
112114 return
113115 }
114116
@@ -121,8 +123,7 @@ func (a adminAPIHandlers) ServiceStatusHandler(w http.ResponseWriter, r *http.Re · 6 unmodified lines
121123 // Marshal API response
122124 jsonBytes, err := json.Marshal(serverStatus)
123125 if err != nil {
124− writeErrorResponseJSON(w, ErrInternalError, r.URL)
125− logger.LogIf(context.Background(), err)
126+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
126127 return
127128 }
128129 // Reply with storage information (across nodes in a
@@ -136,7 +137,9 @@ func (a adminAPIHandlers) ServiceStatusHandler(w http.ResponseWriter, r *http.Re · 7 unmodified lines
136137 // Restarts/Stops minio server gracefully. In a distributed setup,
137138 // restarts all the servers in the cluster.
138139 func (a adminAPIHandlers) ServiceStopNRestartHandler(w http.ResponseWriter, r *http.Request) {
139− adminAPIErr := checkAdminRequestAuthType(r, "")
140+ ctx := newContext(r, w, "ServiceStopNRestart")
141+
142+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
140143 if adminAPIErr != ErrNone {
141144 writeErrorResponseJSON(w, adminAPIErr, r.URL)
142145 return
@@ -145,7 +148,7 @@ func (a adminAPIHandlers) ServiceStopNRestartHandler(w http.ResponseWriter, r *h · 2 unmodified lines
145148 var sa madmin.ServiceAction
146149 err := json.NewDecoder(r.Body).Decode(&sa)
147150 if err != nil {
148− logger.LogIf(context.Background(), err)
151+ logger.LogIf(ctx, err)
149152 writeErrorResponseJSON(w, ErrRequestBodyParse, r.URL)
150153 return
151154 }
@@ -158,7 +161,7 @@ func (a adminAPIHandlers) ServiceStopNRestartHandler(w http.ResponseWriter, r *h · 6 unmodified lines
158161 serviceSig = serviceStop
159162 default:
160163 writeErrorResponseJSON(w, ErrMalformedPOSTRequest, r.URL)
161− logger.LogIf(context.Background(), errors.New("Invalid service action received"))
164+ logger.LogIf(ctx, errors.New("Invalid service action received"))
162165 return
163166 }
164167
@@ -227,10 +230,12 @@ type ServerInfo struct { · 62 unmodified lines
227230 // ----------
228231 // Get server information
229232 func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Request) {
233+ ctx := newContext(r, w, "ServerInfo")
234+
230235 // Authenticate request
231236
232237 // Setting the region as empty so as the mc server info command is irrespective to the region.
233− adminAPIErr := checkAdminRequestAuthType(r, "")
238+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
234239 if adminAPIErr != ErrNone {
235240 writeErrorResponseJSON(w, adminAPIErr, r.URL)
236241 return
@@ -255,7 +260,7 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque · 18 unmodified lines
255260 serverInfoData, err := peer.cmdRunner.ServerInfo()
256261 if err != nil {
257262 reqInfo := (&logger.ReqInfo{}).AppendTags("peerAddress", peer.addr)
258− ctx := logger.SetReqInfo(context.Background(), reqInfo)
263+ ctx := logger.SetReqInfo(ctx, reqInfo)
259264 logger.LogIf(ctx, err)
260265 reply[idx].Error = err.Error()
261266 return
@@ -270,8 +275,7 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque · 8 unmodified lines
270275 // Marshal API response
271276 jsonBytes, err := json.Marshal(reply)
272277 if err != nil {
273− writeErrorResponseJSON(w, ErrInternalError, r.URL)
274− logger.LogIf(context.Background(), err)
278+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
275279 return
276280 }
277281
@@ -292,7 +296,9 @@ type StartProfilingResult struct { · 14 unmodified lines
292296 // ----------
293297 // Enable server profiling
294298 func (a adminAPIHandlers) StartProfilingHandler(w http.ResponseWriter, r *http.Request) {
295− adminAPIErr := checkAdminRequestAuthType(r, "")
299+ ctx := newContext(r, w, "StartProfiling")
300+
301+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
296302 if adminAPIErr != ErrNone {
297303 writeErrorResponseJSON(w, adminAPIErr, r.URL)
298304 return
@@ -351,7 +357,9 @@ func (f dummyFileInfo) Sys() interface{} { return f.sys } · 52 unmodified lines
351357 // ----------
352358 // Download profiling information of all nodes in a zip format
353359 func (a adminAPIHandlers) DownloadProfilingHandler(w http.ResponseWriter, r *http.Request) {
354− adminAPIErr := checkAdminRequestAuthType(r, "")
360+ ctx := newContext(r, w, "DownloadProfiling")
361+
362+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
355363 if adminAPIErr != ErrNone {
356364 writeErrorResponseJSON(w, adminAPIErr, r.URL)
357365 return
@@ -368,7 +376,7 @@ func (a adminAPIHandlers) DownloadProfilingHandler(w http.ResponseWriter, r *htt · 10 unmodified lines
368376 // Get profiling data from a node
369377 data, err := peer.cmdRunner.DownloadProfilingData()
370378 if err != nil {
371− logger.LogIf(context.Background(), fmt.Errorf("Unable to download profiling data from node `%s`, reason: %s", peer.addr, err.Error()))
379+ logger.LogIf(ctx, fmt.Errorf("Unable to download profiling data from node `%s`, reason: %s", peer.addr, err.Error()))
372380 continue
373381 }
374382
@@ -475,7 +483,7 @@ func (a adminAPIHandlers) HealHandler(w http.ResponseWriter, r *http.Request) { · 100 unmodified lines
475483 }
476484
477485 // Validate request signature.
478− adminAPIErr := checkAdminRequestAuthType(r, "")
486+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
479487 if adminAPIErr != ErrNone {
480488 writeErrorResponseJSON(w, adminAPIErr, r.URL)
481489 return
@@ -570,8 +578,7 @@ func (a adminAPIHandlers) HealHandler(w http.ResponseWriter, r *http.Request) { · 88 unmodified lines
570578 StartTime: nh.startTime,
571579 })
572580 if err != nil {
573− logger.LogIf(context.Background(), err)
574− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
581+ writeErrorResponse(w, toAdminAPIErrCode(ctx, err), r.URL)
575582 return
576583 }
577584 // Client token not specified but a heal sequence exists on a path,
@@ -630,7 +637,7 @@ func (a adminAPIHandlers) GetConfigHandler(w http.ResponseWriter, r *http.Reques · 52 unmodified lines
630637 }
631638
632639 // Validate request signature.
633− adminAPIErr := checkAdminRequestAuthType(r, "")
640+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
634641 if adminAPIErr != ErrNone {
635642 writeErrorResponseJSON(w, adminAPIErr, r.URL)
636643 return
@@ -638,22 +645,20 @@ func (a adminAPIHandlers) GetConfigHandler(w http.ResponseWriter, r *http.Reques · 1 unmodified line
638645
639646 config, err := readServerConfig(ctx, objectAPI)
640647 if err != nil {
641− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
648+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
642649 return
643650 }
644651
645652 configData, err := json.MarshalIndent(config, "", "\t")
646653 if err != nil {
647− logger.LogIf(ctx, err)
648− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
654+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
649655 return
650656 }
651657
652658 password := config.GetCredential().SecretKey
653659 econfigData, err := madmin.EncryptData(password, configData)
654660 if err != nil {
655− logger.LogIf(ctx, err)
656− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
661+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
657662 return
658663 }
659664
@@ -692,7 +697,7 @@ func (a adminAPIHandlers) GetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 32 unmodified lines
692697 }
693698
694699 // Validate request signature.
695− adminAPIErr := checkAdminRequestAuthType(r, "")
700+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
696701 if adminAPIErr != ErrNone {
697702 writeErrorResponseJSON(w, adminAPIErr, r.URL)
698703 return
@@ -707,14 +712,13 @@ func (a adminAPIHandlers) GetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 8 unmodified lines
707712
708713 config, err := readServerConfig(ctx, objectAPI)
709714 if err != nil {
710− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
715+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
711716 return
712717 }
713718
714719 configData, err := json.Marshal(config)
715720 if err != nil {
716− logger.LogIf(ctx, err)
717− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
721+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
718722 return
719723 }
720724
@@ -736,8 +740,7 @@ func (a adminAPIHandlers) GetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 15 unmodified lines
736740 password := config.GetCredential().SecretKey
737741 econfigData, err := madmin.EncryptData(password, []byte(newConfigStr))
738742 if err != nil {
739− logger.LogIf(ctx, err)
740− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
743+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
741744 return
742745 }
743746
@@ -746,12 +749,12 @@ func (a adminAPIHandlers) GetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 2 unmodified lines
746749
747750 // toAdminAPIErrCode - converts errXLWriteQuorum error to admin API
748751 // specific error.
749−func toAdminAPIErrCode(err error) APIErrorCode {
752+func toAdminAPIErrCode(ctx context.Context, err error) APIErrorCode {
750753 switch err {
751754 case errXLWriteQuorum:
752755 return ErrAdminConfigNoQuorum
753756 default:
754− return toAPIErrorCode(err)
757+ return toAPIErrorCode(ctx, err)
755758 }
756759 }
757760
@@ -767,7 +770,7 @@ func (a adminAPIHandlers) RemoveUser(w http.ResponseWriter, r *http.Request) { · 9 unmodified lines
767770 }
768771
769772 // Validate request signature.
770− adminAPIErr := checkAdminRequestAuthType(r, "")
773+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
771774 if adminAPIErr != ErrNone {
772775 writeErrorResponseJSON(w, adminAPIErr, r.URL)
773776 return
@@ -782,8 +785,7 @@ func (a adminAPIHandlers) RemoveUser(w http.ResponseWriter, r *http.Request) { · 8 unmodified lines
782785 vars := mux.Vars(r)
783786 accessKey := vars["accessKey"]
784787 if err := globalIAMSys.DeleteUser(accessKey); err != nil {
785− logger.LogIf(ctx, err)
786− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
788+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
787789 }
788790 }
789791
@@ -799,7 +801,7 @@ func (a adminAPIHandlers) ListUsers(w http.ResponseWriter, r *http.Request) { · 9 unmodified lines
799801 }
800802
801803 // Validate request signature.
802− adminAPIErr := checkAdminRequestAuthType(r, "")
804+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
803805 if adminAPIErr != ErrNone {
804806 writeErrorResponseJSON(w, adminAPIErr, r.URL)
805807 return
@@ -807,22 +809,20 @@ func (a adminAPIHandlers) ListUsers(w http.ResponseWriter, r *http.Request) { · 1 unmodified line
807809
808810 allCredentials, err := globalIAMSys.ListUsers()
809811 if err != nil {
810− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
812+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
811813 return
812814 }
813815
814816 data, err := json.Marshal(allCredentials)
815817 if err != nil {
816− logger.LogIf(ctx, err)
817− writeErrorResponseJSON(w, ErrInternalError, r.URL)
818+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
818819 return
819820 }
820821
821822 password := globalServerConfig.GetCredential().SecretKey
822823 econfigData, err := madmin.EncryptData(password, data)
823824 if err != nil {
824− logger.LogIf(ctx, err)
825− writeErrorResponseJSON(w, ErrInternalError, r.URL)
825+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
826826 return
827827 }
828828
@@ -841,7 +841,7 @@ func (a adminAPIHandlers) SetUserStatus(w http.ResponseWriter, r *http.Request) · 12 unmodified lines
841841 }
842842
843843 // Validate request signature.
844− adminAPIErr := checkAdminRequestAuthType(r, "")
844+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
845845 if adminAPIErr != ErrNone {
846846 writeErrorResponseJSON(w, adminAPIErr, r.URL)
847847 return
@@ -864,8 +864,7 @@ func (a adminAPIHandlers) SetUserStatus(w http.ResponseWriter, r *http.Request) · 16 unmodified lines
864864 }
865865
866866 if err := globalIAMSys.SetUserStatus(accessKey, madmin.AccountStatus(status)); err != nil {
867− logger.LogIf(ctx, err)
868− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
867+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
869868 return
870869 }
871870 }
@@ -882,7 +881,7 @@ func (a adminAPIHandlers) AddUser(w http.ResponseWriter, r *http.Request) { · 10 unmodified lines
882881 }
883882
884883 // Validate request signature.
885− adminAPIErr := checkAdminRequestAuthType(r, "")
884+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
886885 if adminAPIErr != ErrNone {
887886 writeErrorResponseJSON(w, adminAPIErr, r.URL)
888887 return
@@ -925,8 +924,7 @@ func (a adminAPIHandlers) AddUser(w http.ResponseWriter, r *http.Request) { · 36 unmodified lines
925924 }
926925
927926 if err = globalIAMSys.SetUser(accessKey, uinfo); err != nil {
928− logger.LogIf(ctx, err)
929− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
927+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
930928 return
931929 }
932930 }
@@ -943,7 +941,7 @@ func (a adminAPIHandlers) ListCannedPolicies(w http.ResponseWriter, r *http.Requ · 10 unmodified lines
943941 }
944942
945943 // Validate request signature.
946− adminAPIErr := checkAdminRequestAuthType(r, "")
944+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
947945 if adminAPIErr != ErrNone {
948946 writeErrorResponseJSON(w, adminAPIErr, r.URL)
949947 return
@@ -951,14 +949,12 @@ func (a adminAPIHandlers) ListCannedPolicies(w http.ResponseWriter, r *http.Requ · 1 unmodified line
951949
952950 policies, err := globalIAMSys.ListCannedPolicies()
953951 if err != nil {
954− logger.LogIf(ctx, err)
955− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
952+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
956953 return
957954 }
958955
959956 if err = json.NewEncoder(w).Encode(policies); err != nil {
960− logger.LogIf(ctx, err)
961− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
957+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
962958 return
963959 }
964960
@@ -980,7 +976,7 @@ func (a adminAPIHandlers) RemoveCannedPolicy(w http.ResponseWriter, r *http.Requ · 15 unmodified lines
980976 policyName := vars["name"]
981977
982978 // Validate request signature.
983− adminAPIErr := checkAdminRequestAuthType(r, "")
979+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
984980 if adminAPIErr != ErrNone {
985981 writeErrorResponseJSON(w, adminAPIErr, r.URL)
986982 return
@@ -993,8 +989,7 @@ func (a adminAPIHandlers) RemoveCannedPolicy(w http.ResponseWriter, r *http.Requ · 6 unmodified lines
993989 }
994990
995991 if err := globalIAMSys.DeleteCannedPolicy(policyName); err != nil {
996− logger.LogIf(ctx, err)
997− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
992+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
998993 return
999994 }
1000995 }
@@ -1014,7 +1009,7 @@ func (a adminAPIHandlers) AddCannedPolicy(w http.ResponseWriter, r *http.Request · 13 unmodified lines
10141009 policyName := vars["name"]
10151010
10161011 // Validate request signature.
1017− adminAPIErr := checkAdminRequestAuthType(r, "")
1012+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
10181013 if adminAPIErr != ErrNone {
10191014 writeErrorResponseJSON(w, adminAPIErr, r.URL)
10201015 return
@@ -1051,8 +1046,7 @@ func (a adminAPIHandlers) AddCannedPolicy(w http.ResponseWriter, r *http.Request · 30 unmodified lines
10511046 }
10521047
10531048 if err = globalIAMSys.SetCannedPolicy(policyName, *iamPolicy); err != nil {
1054− logger.LogIf(ctx, err)
1055− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1049+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
10561050 return
10571051 }
10581052 }
@@ -1073,7 +1067,7 @@ func (a adminAPIHandlers) SetUserPolicy(w http.ResponseWriter, r *http.Request) · 14 unmodified lines
10731067 policyName := vars["name"]
10741068
10751069 // Validate request signature.
1076− adminAPIErr := checkAdminRequestAuthType(r, "")
1070+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
10771071 if adminAPIErr != ErrNone {
10781072 writeErrorResponseJSON(w, adminAPIErr, r.URL)
10791073 return
@@ -1092,8 +1086,7 @@ func (a adminAPIHandlers) SetUserPolicy(w http.ResponseWriter, r *http.Request) · 12 unmodified lines
10921086 }
10931087
10941088 if err := globalIAMSys.SetUserPolicy(accessKey, policyName); err != nil {
1095− logger.LogIf(ctx, err)
1096− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1089+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
10971090 }
10981091 }
10991092
@@ -1109,7 +1102,7 @@ func (a adminAPIHandlers) SetConfigHandler(w http.ResponseWriter, r *http.Reques · 9 unmodified lines
11091102 }
11101103
11111104 // Validate request signature.
1112− adminAPIErr := checkAdminRequestAuthType(r, "")
1105+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
11131106 if adminAPIErr != ErrNone {
11141107 writeErrorResponseJSON(w, adminAPIErr, r.URL)
11151108 return
@@ -1172,7 +1165,7 @@ func (a adminAPIHandlers) SetConfigHandler(w http.ResponseWriter, r *http.Reques · 56 unmodified lines
11721165 }
11731166
11741167 if err = saveServerConfig(ctx, objectAPI, &config); err != nil {
1175− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1168+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
11761169 return
11771170 }
11781171
@@ -1214,7 +1207,7 @@ func (a adminAPIHandlers) SetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 35 unmodified lines
12141207 }
12151208
12161209 // Validate request signature.
1217− adminAPIErr := checkAdminRequestAuthType(r, "")
1210+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
12181211 if adminAPIErr != ErrNone {
12191212 writeErrorResponseJSON(w, adminAPIErr, r.URL)
12201213 return
@@ -1223,15 +1216,14 @@ func (a adminAPIHandlers) SetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 2 unmodified lines
12231216 // Load config
12241217 configStruct, err := readServerConfig(ctx, objectAPI)
12251218 if err != nil {
1226− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1219+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
12271220 return
12281221 }
12291222
12301223 // Convert config to json bytes
12311224 configBytes, err := json.Marshal(configStruct)
12321225 if err != nil {
1233− logger.LogIf(ctx, err)
1234− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1226+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
12351227 return
12361228 }
12371229
@@ -1303,7 +1295,7 @@ func (a adminAPIHandlers) SetConfigKeysHandler(w http.ResponseWriter, r *http.Re · 65 unmodified lines
13031295 }
13041296
13051297 if err = saveServerConfig(ctx, objectAPI, &config); err != nil {
1306− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1298+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
13071299 return
13081300 }
13091301
@@ -1334,7 +1326,7 @@ func (a adminAPIHandlers) UpdateAdminCredentialsHandler(w http.ResponseWriter, · 24 unmodified lines
13341326 }
13351327
13361328 // Authenticate request
1337− adminAPIErr := checkAdminRequestAuthType(r, "")
1329+ adminAPIErr := checkAdminRequestAuthType(ctx, r, "")
13381330 if adminAPIErr != ErrNone {
13391331 writeErrorResponseJSON(w, adminAPIErr, r.URL)
13401332 return
@@ -1364,7 +1356,7 @@ func (a adminAPIHandlers) UpdateAdminCredentialsHandler(w http.ResponseWriter, · 23 unmodified lines
13641356
13651357 creds, err := auth.CreateCredentials(req.AccessKey, req.SecretKey)
13661358 if err != nil {
1367− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1359+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
13681360 return
13691361 }
13701362
@@ -1379,7 +1371,7 @@ func (a adminAPIHandlers) UpdateAdminCredentialsHandler(w http.ResponseWriter, · 8 unmodified lines
13791371 globalActiveCred = creds
13801372
13811373 if err = saveServerConfig(ctx, objectAPI, globalServerConfig); err != nil {
1382− writeErrorResponseJSON(w, toAdminAPIErrCode(err), r.URL)
1374+ writeErrorResponseJSON(w, toAdminAPIErrCode(ctx, err), r.URL)
13831375 return
13841376 }
13851377
cmd/admin-handlers_test.go+2−2
@@ -867,12 +867,12 @@ func TestToAdminAPIErr(t *testing.T) { · 866 unmodified lines
867867 // 3. Non-admin API specific error.
868868 {
869869 err: errDiskNotFound,
870− expectedAPIErr: toAPIErrorCode(errDiskNotFound),
870+ expectedAPIErr: toAPIErrorCode(context.Background(), errDiskNotFound),
871871 },
872872 }
873873
874874 for i, test := range testCases {
875− actualErr := toAdminAPIErrCode(test.err)
875+ actualErr := toAdminAPIErrCode(context.Background(), test.err)
876876 if actualErr != test.expectedAPIErr {
877877 t.Errorf("Test %d: Expected %v but received %v",
878878 i+1, test.expectedAPIErr, actualErr)
cmd/admin-heal-ops.go+9−9
@@ -62,8 +62,8 @@ var ( · 61 unmodified lines
6262 errHealPushStopNDiscard = fmt.Errorf("heal push stopped due to heal stop signal")
6363 errHealStopSignalled = fmt.Errorf("heal stop signaled")
6464
65− errFnHealFromAPIErr = func(err error) error {
66− errCode := toAPIErrorCode(err)
65+ errFnHealFromAPIErr = func(ctx context.Context, err error) error {
66+ errCode := toAPIErrorCode(ctx, err)
6767 apiErr := getAPIError(errCode)
6868 return fmt.Errorf("Heal internal error: %s: %s",
6969 apiErr.Code, apiErr.Description)
@@ -150,7 +150,7 @@ func (ahs *allHealState) stopHealSequence(path string) ([]byte, APIErrorCode) { · 80 unmodified lines
150150 }
151151
152152 b, err := json.Marshal(&hsp)
153− return b, toAdminAPIErrCode(err)
153+ return b, toAdminAPIErrCode(context.Background(), err)
154154 }
155155
156156 // LaunchNewHealSequence - launches a background routine that performs
@@ -254,7 +254,7 @@ func (ahs *allHealState) LaunchNewHealSequence(h *healSequence) ( · 97 unmodified lines
254254 StartTime: h.startTime,
255255 })
256256 if err != nil {
257− logger.LogIf(context.Background(), err)
257+ logger.LogIf(h.ctx, err)
258258 return nil, ErrInternalError, ""
259259 }
260260 return b, ErrNone, ""
@@ -302,7 +302,7 @@ func (ahs *allHealState) PopHealStatusJSON(path string, · 41 unmodified lines
302302
303303 jbytes, err := json.Marshal(h.currentStatus)
304304 if err != nil {
305− logger.LogIf(context.Background(), err)
305+ logger.LogIf(h.ctx, err)
306306 return nil, ErrInternalError
307307 }
308308
@@ -592,7 +592,7 @@ func (h *healSequence) healConfig() error { · 283 unmodified lines
592592 objectInfos, err := objectAPI.ListObjectsHeal(h.ctx, minioMetaBucket, minioConfigPrefix,
593593 marker, "", 1000)
594594 if err != nil {
595− return errFnHealFromAPIErr(err)
595+ return errFnHealFromAPIErr(h.ctx, err)
596596 }
597597
598598 for index := range objectInfos.Objects {
@@ -639,7 +639,7 @@ func (h *healSequence) healDiskFormat() error { · 40 unmodified lines
639639 // return any error, ignore error returned when disks have
640640 // already healed.
641641 if err != nil && err != errNoHealRequired {
642− return errFnHealFromAPIErr(err)
642+ return errFnHealFromAPIErr(h.ctx, err)
643643 }
644644
645645 // Healing succeeded notify the peers to reload format and re-initialize disks.
@@ -671,7 +671,7 @@ func (h *healSequence) healBuckets() error { · 25 unmodified lines
671671
672672 buckets, err := objectAPI.ListBucketsHeal(h.ctx)
673673 if err != nil {
674− return errFnHealFromAPIErr(err)
674+ return errFnHealFromAPIErr(h.ctx, err)
675675 }
676676
677677 for _, bucket := range buckets {
@@ -738,7 +738,7 @@ func (h *healSequence) healBucket(bucket string) error { · 60 unmodified lines
738738 objectInfos, err := objectAPI.ListObjectsHeal(h.ctx, bucket,
739739 h.objPrefix, marker, "", entries)
740740 if err != nil {
741− return errFnHealFromAPIErr(err)
741+ return errFnHealFromAPIErr(h.ctx, err)
742742 }
743743
744744 g := errgroup.WithNErrs(len(objectInfos.Objects))
cmd/api-errors.go+6−1
@@ -23,6 +23,7 @@ import ( · 22 unmodified lines
2323 "net/http"
2424
2525 "github.com/minio/minio/cmd/crypto"
26+ "github.com/minio/minio/cmd/logger"
2627 "github.com/minio/minio/pkg/auth"
2728 "github.com/minio/minio/pkg/dns"
2829 "github.com/minio/minio/pkg/event"
@@ -1440,7 +1441,7 @@ var errorCodeResponse = map[APIErrorCode]APIError{ · 1411 unmodified lines
14401441 // toAPIErrorCode - Converts embedded errors. Convenience
14411442 // function written to handle all cases where we have known types of
14421443 // errors returned by underlying layers.
1443−func toAPIErrorCode(err error) (apiErr APIErrorCode) {
1444+func toAPIErrorCode(ctx context.Context, err error) (apiErr APIErrorCode) {
14441445 if err == nil {
14451446 return ErrNone
14461447 }
@@ -1767,6 +1768,10 @@ func toAPIErrorCode(err error) (apiErr APIErrorCode) { · 320 unmodified lines
17671768 apiErr = ErrObjectTampered
17681769 default:
17691770 apiErr = ErrInternalError
1771+ // Make sure to log the errors which we cannot translate
1772+ // to a meaningful S3 API errors. This is added to aid in
1773+ // debugging unexpected/unhandled errors.
1774+ logger.LogIf(ctx, err)
17701775 }
17711776
17721777 return apiErr
cmd/api-errors_test.go+3−1
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717 package cmd
1818
1919 import (
20+ "context"
2021 "errors"
2122 "testing"
2223
@@ -64,8 +65,9 @@ var toAPIErrorCodeTests = []struct { · 41 unmodified lines
6465 }
6566
6667 func TestAPIErrCode(t *testing.T) {
68+ ctx := context.Background()
6769 for i, testCase := range toAPIErrorCodeTests {
68− errCode := toAPIErrorCode(testCase.err)
70+ errCode := toAPIErrorCode(ctx, testCase.err)
6971 if errCode != testCase.errCode {
7072 t.Errorf("Test %d: Expected error code %d, got %d", i+1, testCase.errCode, errCode)
7173 }
cmd/api-response-multipart.go+5−2
@@ -16,7 +16,10 @@ · 15 unmodified lines
1616
1717 package cmd
1818
19−import "net/http"
19+import (
20+ "context"
21+ "net/http"
22+)
2023
2124 // Represents additional fields necessary for ErrPartTooSmall S3 error.
2225 type completeMultipartAPIError struct {
@@ -42,7 +45,7 @@ type completeMultipartAPIError struct { · 19 unmodified lines
4245 // of this function.
4346 func writePartSmallErrorResponse(w http.ResponseWriter, r *http.Request, err PartTooSmall) {
4447
45− apiError := getAPIError(toAPIErrorCode(err))
48+ apiError := getAPIError(toAPIErrorCode(context.Background(), err))
4649 // Generate complete multipart error response.
4750 errorResponse := getAPIErrorResponse(apiError, r.URL.Path, w.Header().Get(responseRequestIDKey))
4851 cmpErrResp := completeMultipartAPIError{err.PartSize, int64(5242880), err.PartNumber, err.PartETag, errorResponse}
cmd/auth-handler.go+8−8
@@ -119,7 +119,7 @@ func getRequestAuthType(r *http.Request) authType { · 118 unmodified lines
119119
120120 // checkAdminRequestAuthType checks whether the request is a valid signature V2 or V4 request.
121121 // It does not accept presigned or JWT or anonymous requests.
122−func checkAdminRequestAuthType(r *http.Request, region string) APIErrorCode {
122+func checkAdminRequestAuthType(ctx context.Context, r *http.Request, region string) APIErrorCode {
123123 s3Err := ErrAccessDenied
124124 if _, ok := r.Header["X-Amz-Content-Sha256"]; ok &&
125125 getRequestAuthType(r) == authTypeSigned && !skipContentSha256Cksum(r) {
@@ -136,11 +136,11 @@ func checkAdminRequestAuthType(r *http.Request, region string) APIErrorCode { · 10 unmodified lines
136136 }
137137
138138 // we only support V4 (no presign) with auth body
139− s3Err = isReqAuthenticated(r, region)
139+ s3Err = isReqAuthenticated(ctx, r, region)
140140 }
141141 if s3Err != ErrNone {
142142 reqInfo := (&logger.ReqInfo{}).AppendTags("requestHeaders", dumpRequest(r))
143− ctx := logger.SetReqInfo(context.Background(), reqInfo)
143+ ctx := logger.SetReqInfo(ctx, reqInfo)
144144 logger.LogIf(ctx, errors.New(getAPIError(s3Err).Description))
145145 }
146146 return s3Err
@@ -194,10 +194,10 @@ func getClaimsFromToken(r *http.Request, cred auth.Credentials) (map[string]inte · 47 unmodified lines
194194 p := &jwtgo.Parser{}
195195 jtoken, err := p.ParseWithClaims(token, jwtgo.MapClaims(claims), stsTokenCallback)
196196 if err != nil {
197− return nil, toAPIErrorCode(errAuthentication)
197+ return nil, toAPIErrorCode(context.Background(), errAuthentication)
198198 }
199199 if !jtoken.Valid {
200− return nil, toAPIErrorCode(errAuthentication)
200+ return nil, toAPIErrorCode(context.Background(), errAuthentication)
201201 }
202202 return claims, ErrNone
203203 }
@@ -224,7 +224,7 @@ func checkRequestAuthType(ctx context.Context, r *http.Request, action policy.Ac · 20 unmodified lines
224224 case policy.GetBucketLocationAction, policy.ListAllMyBucketsAction:
225225 region = ""
226226 }
227− if s3Err = isReqAuthenticated(r, region); s3Err != ErrNone {
227+ if s3Err = isReqAuthenticated(ctx, r, region); s3Err != ErrNone {
228228 return s3Err
229229 }
230230 cred, owner, s3Err = getReqAccessKeyV4(r, region)
@@ -310,7 +310,7 @@ func reqSignatureV4Verify(r *http.Request, region string) (s3Error APIErrorCode) · 79 unmodified lines
310310 }
311311
312312 // Verify if request has valid AWS Signature Version '4'.
313−func isReqAuthenticated(r *http.Request, region string) (s3Error APIErrorCode) {
313+func isReqAuthenticated(ctx context.Context, r *http.Request, region string) (s3Error APIErrorCode) {
314314 if errCode := reqSignatureV4Verify(r, region); errCode != ErrNone {
315315 return errCode
316316 }
@@ -347,7 +347,7 @@ func isReqAuthenticated(r *http.Request, region string) (s3Error APIErrorCode) { · 30 unmodified lines
347347 // The verification happens implicit during reading.
348348 reader, err := hash.NewReader(r.Body, -1, hex.EncodeToString(contentMD5), hex.EncodeToString(contentSHA256), -1)
349349 if err != nil {
350− return toAPIErrorCode(err)
350+ return toAPIErrorCode(ctx, err)
351351 }
352352 r.Body = ioutil.NopCloser(reader)
353353 return ErrNone
cmd/auth-handler_test.go+7−4
@@ -18,6 +18,7 @@ package cmd · 17 unmodified lines
1818
1919 import (
2020 "bytes"
21+ "context"
2122 "io"
2223 "io/ioutil"
2324 "net/http"
@@ -377,11 +378,12 @@ func TestIsReqAuthenticated(t *testing.T) { · 353 unmodified lines
377378 {mustNewSignedRequest("GET", "http://127.0.0.1:9000", 0, nil, t), ErrNone},
378379 }
379380
381+ ctx := context.Background()
380382 // Validates all testcases.
381383 for i, testCase := range testCases {
382− if s3Error := isReqAuthenticated(testCase.req, globalServerConfig.GetRegion()); s3Error != testCase.s3Error {
383− if _, err := ioutil.ReadAll(testCase.req.Body); toAPIErrorCode(err) != testCase.s3Error {
384− t.Fatalf("Test %d: Unexpected S3 error: want %d - got %d (got after reading request %d)", i, testCase.s3Error, s3Error, toAPIErrorCode(err))
384+ if s3Error := isReqAuthenticated(ctx, testCase.req, globalServerConfig.GetRegion()); s3Error != testCase.s3Error {
385+ if _, err := ioutil.ReadAll(testCase.req.Body); toAPIErrorCode(ctx, err) != testCase.s3Error {
386+ t.Fatalf("Test %d: Unexpected S3 error: want %d - got %d (got after reading request %d)", i, testCase.s3Error, s3Error, toAPIErrorCode(ctx, err))
385387 }
386388 }
387389 }
@@ -413,8 +415,9 @@ func TestCheckAdminRequestAuthType(t *testing.T) { · 25 unmodified lines
413415 {Request: mustNewPresignedV2Request("GET", "http://127.0.0.1:9000", 0, nil, t), ErrCode: ErrAccessDenied},
414416 {Request: mustNewPresignedRequest("GET", "http://127.0.0.1:9000", 0, nil, t), ErrCode: ErrAccessDenied},
415417 }
418+ ctx := context.Background()
416419 for i, testCase := range testCases {
417− if s3Error := checkAdminRequestAuthType(testCase.Request, globalServerConfig.GetRegion()); s3Error != testCase.ErrCode {
420+ if s3Error := checkAdminRequestAuthType(ctx, testCase.Request, globalServerConfig.GetRegion()); s3Error != testCase.ErrCode {
418421 t.Errorf("Test %d: Unexpected s3error returned wanted %d, got %d", i, testCase.ErrCode, s3Error)
419422 }
420423 }
cmd/bucket-handlers-listobjects.go+4−4
@@ -100,7 +100,7 @@ func (api objectAPIHandlers) ListObjectsV2Handler(w http.ResponseWriter, r *http · 99 unmodified lines
100100 // marshaled into S3 compatible XML header.
101101 listObjectsV2Info, err := listObjectsV2(ctx, bucket, prefix, token, delimiter, maxKeys, fetchOwner, startAfter)
102102 if err != nil {
103− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
103+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
104104 return
105105 }
106106
@@ -118,7 +118,7 @@ func (api objectAPIHandlers) ListObjectsV2Handler(w http.ResponseWriter, r *http · 11 unmodified lines
118118 } else if crypto.IsEncrypted(listObjectsV2Info.Objects[i].UserDefined) {
119119 listObjectsV2Info.Objects[i].Size, err = listObjectsV2Info.Objects[i].DecryptedSize()
120120 if err != nil {
121− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
121+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
122122 return
123123 }
124124 }
@@ -182,7 +182,7 @@ func (api objectAPIHandlers) ListObjectsV1Handler(w http.ResponseWriter, r *http · 57 unmodified lines
182182 // marshaled into S3 compatible XML header.
183183 listObjectsInfo, err := listObjects(ctx, bucket, prefix, marker, delimiter, maxKeys)
184184 if err != nil {
185− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
185+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
186186 return
187187 }
188188
@@ -200,7 +200,7 @@ func (api objectAPIHandlers) ListObjectsV1Handler(w http.ResponseWriter, r *http · 11 unmodified lines
200200 } else if crypto.IsEncrypted(listObjectsInfo.Objects[i].UserDefined) {
201201 listObjectsInfo.Objects[i].Size, err = listObjectsInfo.Objects[i].DecryptedSize()
202202 if err != nil {
203− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
203+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
204204 return
205205 }
206206 }
cmd/bucket-handlers.go+20−20
@@ -110,7 +110,7 @@ func (api objectAPIHandlers) GetBucketLocationHandler(w http.ResponseWriter, r * · 109 unmodified lines
110110 getBucketInfo = api.CacheAPI().GetBucketInfo
111111 }
112112 if _, err := getBucketInfo(ctx, bucket); err != nil {
113− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
113+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
114114 return
115115 }
116116
@@ -174,7 +174,7 @@ func (api objectAPIHandlers) ListMultipartUploadsHandler(w http.ResponseWriter, · 57 unmodified lines
174174
175175 listMultipartsInfo, err := objectAPI.ListMultipartUploads(ctx, bucket, prefix, keyMarker, uploadIDMarker, delimiter, maxUploads)
176176 if err != nil {
177− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
177+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
178178 return
179179 }
180180 // generate response
@@ -214,7 +214,7 @@ func (api objectAPIHandlers) ListBucketsHandler(w http.ResponseWriter, r *http.R · 33 unmodified lines
214214 if globalDNSConfig != nil {
215215 dnsBuckets, err := globalDNSConfig.List()
216216 if err != nil && err != dns.ErrNoEntriesFound {
217− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
217+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
218218 return
219219 }
220220 bucketSet := set.NewStringSet()
@@ -233,7 +233,7 @@ func (api objectAPIHandlers) ListBucketsHandler(w http.ResponseWriter, r *http.R · 12 unmodified lines
233233 var err error
234234 bucketsInfo, err = listBuckets(ctx)
235235 if err != nil {
236− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
236+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
237237 return
238238 }
239239 }
@@ -354,8 +354,8 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter, · 114 unmodified lines
354354 }
355355 // Error during delete should be collected separately.
356356 deleteErrors = append(deleteErrors, DeleteError{
357− Code: errorCodeResponse[toAPIErrorCode(err)].Code,
358− Message: errorCodeResponse[toAPIErrorCode(err)].Description,
357+ Code: errorCodeResponse[toAPIErrorCode(ctx, err)].Code,
358+ Message: errorCodeResponse[toAPIErrorCode(ctx, err)].Description,
359359 Key: object.ObjectName,
360360 })
361361 }
@@ -432,12 +432,12 @@ func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Req · 70 unmodified lines
432432 if err == dns.ErrNoEntriesFound {
433433 // Proceed to creating a bucket.
434434 if err = objectAPI.MakeBucketWithLocation(ctx, bucket, location); err != nil {
435− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
435+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
436436 return
437437 }
438438 if err = globalDNSConfig.Put(bucket); err != nil {
439439 objectAPI.DeleteBucket(ctx, bucket)
440− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
440+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
441441 return
442442 }
443443
@@ -447,7 +447,7 @@ func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Req · 3 unmodified lines
447447 writeSuccessResponseHeadersOnly(w)
448448 return
449449 }
450− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
450+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
451451 return
452452
453453 }
@@ -458,7 +458,7 @@ func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Req · 4 unmodified lines
458458 // Proceed to creating a bucket.
459459 err := objectAPI.MakeBucketWithLocation(ctx, bucket, location)
460460 if err != nil {
461− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
461+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
462462 return
463463 }
464464
@@ -589,12 +589,12 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h · 124 unmodified lines
589589 lengthRange := postPolicyForm.Conditions.ContentLengthRange
590590 if lengthRange.Valid {
591591 if fileSize < lengthRange.Min {
592− writeErrorResponse(w, toAPIErrorCode(errDataTooSmall), r.URL)
592+ writeErrorResponse(w, toAPIErrorCode(ctx, errDataTooSmall), r.URL)
593593 return
594594 }
595595
596596 if fileSize > lengthRange.Max || isMaxObjectSize(fileSize) {
597− writeErrorResponse(w, toAPIErrorCode(errDataTooLarge), r.URL)
597+ writeErrorResponse(w, toAPIErrorCode(ctx, errDataTooLarge), r.URL)
598598 return
599599 }
600600 }
@@ -610,7 +610,7 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h · 9 unmodified lines
610610 hashReader, err := hash.NewReader(fileBody, fileSize, "", "", fileSize)
611611 if err != nil {
612612 logger.LogIf(ctx, err)
613− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
613+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
614614 return
615615 }
616616
@@ -621,19 +621,19 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h · 4 unmodified lines
621621 if crypto.SSEC.IsRequested(formValues) {
622622 key, err = ParseSSECustomerHeader(formValues)
623623 if err != nil {
624− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
624+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
625625 return
626626 }
627627 }
628628 reader, err = newEncryptReader(hashReader, key, bucket, object, metadata, crypto.S3.IsRequested(formValues))
629629 if err != nil {
630− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
630+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
631631 return
632632 }
633633 info := ObjectInfo{Size: fileSize}
634634 hashReader, err = hash.NewReader(reader, info.EncryptedSize(), "", "", fileSize) // do not try to verify encrypted content
635635 if err != nil {
636− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
636+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
637637 return
638638 }
639639 }
@@ -641,7 +641,7 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h · 1 unmodified line
641641
642642 objInfo, err := objectAPI.PutObject(ctx, bucket, object, hashReader, metadata, ObjectOptions{})
643643 if err != nil {
644− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
644+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
645645 return
646646 }
647647
@@ -721,7 +721,7 @@ func (api objectAPIHandlers) HeadBucketHandler(w http.ResponseWriter, r *http.Re · 73 unmodified lines
721721 getBucketInfo = api.CacheAPI().GetBucketInfo
722722 }
723723 if _, err := getBucketInfo(ctx, bucket); err != nil {
724− writeErrorResponseHeadersOnly(w, toAPIErrorCode(err))
724+ writeErrorResponseHeadersOnly(w, toAPIErrorCode(ctx, err))
725725 return
726726 }
727727
@@ -754,7 +754,7 @@ func (api objectAPIHandlers) DeleteBucketHandler(w http.ResponseWriter, r *http. · 26 unmodified lines
754754 }
755755 // Attempt to delete bucket.
756756 if err := deleteBucket(ctx, bucket); err != nil {
757− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
757+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
758758 return
759759 }
760760
@@ -766,7 +766,7 @@ func (api objectAPIHandlers) DeleteBucketHandler(w http.ResponseWriter, r *http. · 5 unmodified lines
766766 if err := globalDNSConfig.Delete(bucket); err != nil {
767767 // Deleting DNS entry failed, attempt to create the bucket again.
768768 objectAPI.MakeBucketWithLocation(ctx, bucket, "")
769− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
769+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
770770 return
771771 }
772772 }
cmd/bucket-notification-handlers.go+16−20
@@ -67,7 +67,7 @@ func (api objectAPIHandlers) GetBucketNotificationHandler(w http.ResponseWriter, · 66 unmodified lines
6767
6868 _, err := objAPI.GetBucketInfo(ctx, bucketName)
6969 if err != nil {
70− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
70+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
7171 return
7272 }
7373
@@ -76,7 +76,7 @@ func (api objectAPIHandlers) GetBucketNotificationHandler(w http.ResponseWriter, · 2 unmodified lines
7676 if err != nil {
7777 // Ignore errNoSuchNotifications to comply with AWS S3.
7878 if err != errNoSuchNotifications {
79− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
79+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
8080 return
8181 }
8282
@@ -90,8 +90,7 @@ func (api objectAPIHandlers) GetBucketNotificationHandler(w http.ResponseWriter, · 7 unmodified lines
9090
9191 notificationBytes, err := xml.Marshal(nConfig)
9292 if err != nil {
93− logger.LogIf(ctx, err)
94− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
93+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
9594 return
9695 }
9796
@@ -126,7 +125,7 @@ func (api objectAPIHandlers) PutBucketNotificationHandler(w http.ResponseWriter, · 28 unmodified lines
126125
127126 _, err := objectAPI.GetBucketInfo(ctx, bucketName)
128127 if err != nil {
129− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
128+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
130129 return
131130 }
132131
@@ -141,7 +140,7 @@ func (api objectAPIHandlers) PutBucketNotificationHandler(w http.ResponseWriter, · 8 unmodified lines
141140 if err != nil {
142141 apiErr := ErrMalformedXML
143142 if event.IsEventError(err) {
144− apiErr = toAPIErrorCode(err)
143+ apiErr = toAPIErrorCode(ctx, err)
145144 }
146145
147146 writeErrorResponse(w, apiErr, r.URL)
@@ -149,7 +148,7 @@ func (api objectAPIHandlers) PutBucketNotificationHandler(w http.ResponseWriter, · 1 unmodified line
149148 }
150149
151150 if err = saveNotificationConfig(ctx, objectAPI, bucketName, config); err != nil {
152− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
151+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
153152 return
154153 }
155154
@@ -194,7 +193,7 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 38 unmodified lines
194193 }
195194 if len(values["prefix"]) == 1 {
196195 if err := event.ValidateFilterRuleValue(values["prefix"][0]); err != nil {
197− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
196+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
198197 return
199198 }
200199
@@ -207,7 +206,7 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 6 unmodified lines
207206 }
208207 if len(values["suffix"]) == 1 {
209208 if err := event.ValidateFilterRuleValue(values["suffix"][0]); err != nil {
210− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
209+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
211210 return
212211 }
213212
@@ -220,7 +219,7 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 6 unmodified lines
220219 for _, s := range values["events"] {
221220 eventName, err := event.ParseName(s)
222221 if err != nil {
223− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
222+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
224223 return
225224 }
226225
@@ -228,19 +227,19 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 1 unmodified line
228227 }
229228
230229 if _, err := objAPI.GetBucketInfo(ctx, bucketName); err != nil {
231− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
230+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
232231 return
233232 }
234233
235234 host, err := xnet.ParseHost(r.RemoteAddr)
236235 if err != nil {
237− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
236+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
238237 return
239238 }
240239
241240 target, err := target.NewHTTPClientTarget(*host, w)
242241 if err != nil {
243− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
242+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
244243 return
245244 }
246245
@@ -248,8 +247,7 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 1 unmodified line
248247
249248 if err = globalNotificationSys.AddRemoteTarget(bucketName, target, rulesMap); err != nil {
250249 logger.GetReqInfo(ctx).AppendTags("target", target.ID().Name)
251− logger.LogIf(ctx, err)
252− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
250+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
253251 return
254252 }
255253 defer globalNotificationSys.RemoveRemoteTarget(bucketName, target.ID())
@@ -257,14 +255,13 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 1 unmodified line
257255
258256 thisAddr, err := xnet.ParseHost(GetLocalPeer(globalEndpoints))
259257 if err != nil {
260− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
258+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
261259 return
262260 }
263261
264262 if err = SaveListener(objAPI, bucketName, eventNames, pattern, target.ID(), *thisAddr); err != nil {
265263 logger.GetReqInfo(ctx).AppendTags("target", target.ID().Name)
266− logger.LogIf(ctx, err)
267− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
264+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
268265 return
269266 }
270267
@@ -274,8 +271,7 @@ func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWrit · 3 unmodified lines
274271
275272 if err = RemoveListener(objAPI, bucketName, target.ID(), *thisAddr); err != nil {
276273 logger.GetReqInfo(ctx).AppendTags("target", target.ID().Name)
277− logger.LogIf(ctx, err)
278− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
274+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
279275 return
280276 }
281277 }
cmd/bucket-policy-handlers.go+7−8
@@ -58,7 +58,7 @@ func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *ht · 57 unmodified lines
5858
5959 // Check if bucket exists.
6060 if _, err := objAPI.GetBucketInfo(ctx, bucket); err != nil {
61− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
61+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
6262 return
6363 }
6464
@@ -88,7 +88,7 @@ func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *ht · 23 unmodified lines
8888 }
8989
9090 if err = objAPI.SetBucketPolicy(ctx, bucket, bucketPolicy); err != nil {
91− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
91+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
9292 return
9393 }
9494
@@ -121,12 +121,12 @@ func (api objectAPIHandlers) DeleteBucketPolicyHandler(w http.ResponseWriter, r · 26 unmodified lines
121121
122122 // Check if bucket exists.
123123 if _, err := objAPI.GetBucketInfo(ctx, bucket); err != nil {
124− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
124+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
125125 return
126126 }
127127
128128 if err := objAPI.DeleteBucketPolicy(ctx, bucket); err != nil {
129− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
129+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
130130 return
131131 }
132132
@@ -159,21 +159,20 @@ func (api objectAPIHandlers) GetBucketPolicyHandler(w http.ResponseWriter, r *ht · 26 unmodified lines
159159
160160 // Check if bucket exists.
161161 if _, err := objAPI.GetBucketInfo(ctx, bucket); err != nil {
162− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
162+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
163163 return
164164 }
165165
166166 // Read bucket access policy.
167167 bucketPolicy, err := objAPI.GetBucketPolicy(ctx, bucket)
168168 if err != nil {
169− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
169+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
170170 return
171171 }
172172
173173 policyData, err := json.Marshal(bucketPolicy)
174174 if err != nil {
175− logger.LogIf(ctx, err)
176− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
175+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
177176 return
178177 }
179178
cmd/encryption-v1.go+1−1
@@ -1062,7 +1062,7 @@ func DecryptCopyObjectInfo(info *ObjectInfo, headers http.Header) (apiErr APIErr · 1061 unmodified lines
10621062 }
10631063 var err error
10641064 if info.Size, err = info.DecryptedSize(); err != nil {
1065− apiErr = toAPIErrorCode(err)
1065+ apiErr = toAPIErrorCode(context.Background(), err)
10661066 }
10671067 }
10681068 return
cmd/generic-handlers.go+1−1
@@ -655,7 +655,7 @@ func (f bucketForwardingHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques · 654 unmodified lines
655655 if err == dns.ErrNoEntriesFound {
656656 writeErrorResponse(w, ErrNoSuchBucket, r.URL)
657657 } else {
658− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
658+ writeErrorResponse(w, toAPIErrorCode(context.Background(), err), r.URL)
659659 }
660660 return
661661 }
cmd/object-handlers.go+60−60
@@ -124,7 +124,7 @@ func (api objectAPIHandlers) SelectObjectContentHandler(w http.ResponseWriter, r · 123 unmodified lines
124124 }
125125
126126 _, err := getObjectInfo(ctx, bucket, object, ObjectOptions{})
127− if toAPIErrorCode(err) == ErrNoSuchKey {
127+ if toAPIErrorCode(ctx, err) == ErrNoSuchKey {
128128 s3Error = ErrNoSuchKey
129129 }
130130 }
@@ -166,7 +166,7 @@ func (api objectAPIHandlers) SelectObjectContentHandler(w http.ResponseWriter, r · 35 unmodified lines
166166
167167 gr, err := getObjectNInfo(ctx, bucket, object, nil, r.Header, readLock, ObjectOptions{})
168168 if err != nil {
169− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
169+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
170170 return
171171 }
172172 defer gr.Close()
@@ -257,14 +257,14 @@ func (api objectAPIHandlers) SelectObjectContentHandler(w http.ResponseWriter, r · 84 unmodified lines
257257
258258 s3s, err := s3select.New(reader, objInfo.GetActualSize(), selectReq)
259259 if err != nil {
260− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
260+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
261261 return
262262 }
263263
264264 // Parses the select query and checks for an error
265265 _, _, _, _, _, _, err = s3select.ParseSelect(s3s)
266266 if err != nil {
267− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
267+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
268268 return
269269 }
270270
@@ -343,7 +343,7 @@ func (api objectAPIHandlers) GetObjectHandler(w http.ResponseWriter, r *http.Req · 72 unmodified lines
343343 }
344344
345345 _, err := getObjectInfo(ctx, bucket, object, opts)
346− if toAPIErrorCode(err) == ErrNoSuchKey {
346+ if toAPIErrorCode(ctx, err) == ErrNoSuchKey {
347347 s3Error = ErrNoSuchKey
348348 }
349349 }
@@ -377,7 +377,7 @@ func (api objectAPIHandlers) GetObjectHandler(w http.ResponseWriter, r *http.Req · 27 unmodified lines
377377
378378 gr, err := getObjectNInfo(ctx, bucket, object, rs, r.Header, readLock, opts)
379379 if err != nil {
380− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
380+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
381381 return
382382 }
383383 defer gr.Close()
@@ -386,7 +386,7 @@ func (api objectAPIHandlers) GetObjectHandler(w http.ResponseWriter, r *http.Req · 2 unmodified lines
386386
387387 if objectAPI.IsEncryptionSupported() {
388388 if _, err = DecryptObjectInfo(objInfo, r.Header); err != nil {
389− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
389+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
390390 return
391391 }
392392 }
@@ -409,8 +409,8 @@ func (api objectAPIHandlers) GetObjectHandler(w http.ResponseWriter, r *http.Req · 16 unmodified lines
409409 }
410410 }
411411
412− if hErr := setObjectHeaders(w, objInfo, rs); hErr != nil {
413− writeErrorResponse(w, toAPIErrorCode(hErr), r.URL)
412+ if err = setObjectHeaders(w, objInfo, rs); err != nil {
413+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
414414 return
415415 }
416416
@@ -426,14 +426,14 @@ func (api objectAPIHandlers) GetObjectHandler(w http.ResponseWriter, r *http.Req · 9 unmodified lines
426426 // Write object content to response body
427427 if _, err = io.Copy(httpWriter, gr); err != nil {
428428 if !httpWriter.HasWritten() && !statusCodeWritten { // write error response only if no data or headers has been written to client yet
429− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
429+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
430430 }
431431 return
432432 }
433433
434434 if err = httpWriter.Close(); err != nil {
435435 if !httpWriter.HasWritten() && !statusCodeWritten { // write error response only if no data or headers has been written to client yet
436− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
436+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
437437 return
438438 }
439439 }
@@ -507,7 +507,7 @@ func (api objectAPIHandlers) HeadObjectHandler(w http.ResponseWriter, r *http.Re · 67 unmodified lines
507507 IsOwner: false,
508508 }) {
509509 _, err := getObjectInfo(ctx, bucket, object, opts)
510− if toAPIErrorCode(err) == ErrNoSuchKey {
510+ if toAPIErrorCode(ctx, err) == ErrNoSuchKey {
511511 s3Error = ErrNoSuchKey
512512 }
513513 }
@@ -536,13 +536,13 @@ func (api objectAPIHandlers) HeadObjectHandler(w http.ResponseWriter, r *http.Re · 22 unmodified lines
536536
537537 objInfo, err := getObjectInfo(ctx, bucket, object, opts)
538538 if err != nil {
539− writeErrorResponseHeadersOnly(w, toAPIErrorCode(err))
539+ writeErrorResponseHeadersOnly(w, toAPIErrorCode(ctx, err))
540540 return
541541 }
542542
543543 if objectAPI.IsEncryptionSupported() {
544544 if _, err = DecryptObjectInfo(objInfo, r.Header); err != nil {
545− writeErrorResponseHeadersOnly(w, toAPIErrorCode(err))
545+ writeErrorResponseHeadersOnly(w, toAPIErrorCode(ctx, err))
546546 return
547547 }
548548 }
@@ -556,7 +556,7 @@ func (api objectAPIHandlers) HeadObjectHandler(w http.ResponseWriter, r *http.Re · 7 unmodified lines
556556 case crypto.SSEC.IsEncrypted(objInfo.UserDefined):
557557 // Validate the SSE-C Key set in the header.
558558 if _, err = crypto.SSEC.UnsealObjectKey(r.Header, objInfo.UserDefined, bucket, object); err != nil {
559− writeErrorResponseHeadersOnly(w, toAPIErrorCode(err))
559+ writeErrorResponseHeadersOnly(w, toAPIErrorCode(ctx, err))
560560 return
561561 }
562562 w.Header().Set(crypto.SSECAlgorithm, r.Header.Get(crypto.SSECAlgorithm))
@@ -571,8 +571,8 @@ func (api objectAPIHandlers) HeadObjectHandler(w http.ResponseWriter, r *http.Re · 8 unmodified lines
571571 }
572572
573573 // Set standard object headers.
574− if hErr := setObjectHeaders(w, objInfo, rs); hErr != nil {
575− writeErrorResponseHeadersOnly(w, toAPIErrorCode(hErr))
574+ if err = setObjectHeaders(w, objInfo, rs); err != nil {
575+ writeErrorResponseHeadersOnly(w, toAPIErrorCode(ctx, err))
576576 return
577577 }
578578
@@ -716,7 +716,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 137 unmodified lines
716716 var rs *HTTPRangeSpec
717717 gr, err := getObjectNInfo(ctx, srcBucket, srcObject, rs, r.Header, lock, srcOpts)
718718 if err != nil {
719− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
719+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
720720 return
721721 }
722722 defer gr.Close()
@@ -758,7 +758,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 35 unmodified lines
758758 if crypto.IsEncrypted(srcInfo.UserDefined) {
759759 actualSize, err = srcInfo.DecryptedSize()
760760 if err != nil {
761− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
761+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
762762 return
763763 }
764764 }
@@ -797,7 +797,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 32 unmodified lines
797797
798798 srcInfo.Reader, err = hash.NewReader(reader, length, "", "", actualSize)
799799 if err != nil {
800− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
800+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
801801 return
802802 }
803803
@@ -805,7 +805,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 1 unmodified line
805805 if objectAPI.IsEncryptionSupported() && !isCompressed {
806806 // Encryption parameters not applicable for this object.
807807 if !crypto.IsEncrypted(srcInfo.UserDefined) && crypto.SSECopy.IsRequested(r.Header) {
808− writeErrorResponse(w, toAPIErrorCode(errInvalidEncryptionParameters), r.URL)
808+ writeErrorResponse(w, toAPIErrorCode(ctx, errInvalidEncryptionParameters), r.URL)
809809 return
810810 }
811811 // Encryption parameters not present for this object.
@@ -825,7 +825,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 13 unmodified lines
825825 if sseC {
826826 newKey, err = ParseSSECustomerRequest(r)
827827 if err != nil {
828− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
828+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
829829 return
830830 }
831831 }
@@ -838,7 +838,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 6 unmodified lines
838838 if sseCopyC && sseC {
839839 oldKey, err = ParseSSECopyCustomerRequest(r.Header, srcInfo.UserDefined)
840840 if err != nil {
841− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
841+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
842842 return
843843 }
844844 }
@@ -848,7 +848,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 3 unmodified lines
848848
849849 // In case of SSE-S3 oldKey and newKey aren't used - the KMS manages the keys.
850850 if err = rotateKey(oldKey, newKey, srcBucket, srcObject, encMetadata); err != nil {
851− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
851+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
852852 return
853853 }
854854
@@ -880,7 +880,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 25 unmodified lines
880880 if isTargetEncrypted {
881881 reader, err = newEncryptReader(reader, newKey, dstBucket, dstObject, encMetadata, sseS3)
882882 if err != nil {
883− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
883+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
884884 return
885885 }
886886 }
@@ -893,7 +893,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 6 unmodified lines
893893
894894 srcInfo.Reader, err = hash.NewReader(reader, targetSize, "", "", targetSize) // do not try to verify encrypted content
895895 if err != nil {
896− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
896+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
897897 return
898898 }
899899 }
@@ -966,7 +966,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re · 66 unmodified lines
966966 // object is same then only metadata is updated.
967967 objInfo, err = objectAPI.CopyObject(ctx, srcBucket, srcObject, dstBucket, dstObject, srcInfo, srcOpts, dstOpts)
968968 if err != nil {
969− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
969+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
970970 return
971971 }
972972 }
@@ -1059,7 +1059,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req · 86 unmodified lines
10591059 }
10601060 size, err = strconv.ParseInt(sizeStr[0], 10, 64)
10611061 if err != nil {
1062− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1062+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
10631063 return
10641064 }
10651065 }
@@ -1154,7 +1154,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req · 88 unmodified lines
11541154 var actualReader *hash.Reader
11551155 actualReader, err = hash.NewReader(reader, size, md5hex, sha256hex, actualSize)
11561156 if err != nil {
1157− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1157+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
11581158 return
11591159 }
11601160
@@ -1174,7 +1174,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req · 13 unmodified lines
11741174
11751175 hashReader, err := hash.NewReader(reader, size, md5hex, sha256hex, actualSize)
11761176 if err != nil {
1177− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1177+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
11781178 return
11791179 }
11801180 opts := ObjectOptions{}
@@ -1190,13 +1190,13 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req · 9 unmodified lines
11901190 if hasServerSideEncryptionHeader(r.Header) && !hasSuffix(object, slashSeparator) { // handle SSE requests
11911191 reader, err = EncryptRequest(hashReader, r, bucket, object, metadata)
11921192 if err != nil {
1193− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1193+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
11941194 return
11951195 }
11961196 info := ObjectInfo{Size: size}
11971197 hashReader, err = hash.NewReader(reader, info.EncryptedSize(), "", "", size) // do not try to verify encrypted content
11981198 if err != nil {
1199− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1199+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
12001200 return
12011201 }
12021202 }
@@ -1212,7 +1212,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req · 9 unmodified lines
12121212 // Create the object..
12131213 objInfo, err := putObject(ctx, bucket, object, hashReader, metadata, opts)
12141214 if err != nil {
1215− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1215+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
12161216 return
12171217 }
12181218
@@ -1309,7 +1309,7 @@ func (api objectAPIHandlers) NewMultipartUploadHandler(w http.ResponseWriter, r · 90 unmodified lines
13091309 if objectAPI.IsEncryptionSupported() {
13101310 if hasServerSideEncryptionHeader(r.Header) {
13111311 if err := setEncryptionMetadata(r, bucket, object, encMetadata); err != nil {
1312− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1312+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
13131313 return
13141314 }
13151315 // Set this for multipart only operations, we need to differentiate during
@@ -1345,7 +1345,7 @@ func (api objectAPIHandlers) NewMultipartUploadHandler(w http.ResponseWriter, r · 29 unmodified lines
13451345 }
13461346 uploadID, err := newMultipartUpload(ctx, bucket, object, metadata, opts)
13471347 if err != nil {
1348− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1348+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
13491349 return
13501350 }
13511351
@@ -1447,7 +1447,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 95 unmodified lines
14471447
14481448 gr, err := getObjectNInfo(ctx, srcBucket, srcObject, rs, r.Header, readLock, srcOpts)
14491449 if err != nil {
1450− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1450+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
14511451 return
14521452 }
14531453 defer gr.Close()
@@ -1457,7 +1457,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 3 unmodified lines
14571457 if crypto.IsEncrypted(srcInfo.UserDefined) {
14581458 actualPartSize, err = srcInfo.DecryptedSize()
14591459 if err != nil {
1460− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1460+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
14611461 return
14621462 }
14631463 }
@@ -1476,7 +1476,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 12 unmodified lines
14761476 // Get the object offset & length
14771477 startOffset, length, err := rs.GetOffsetLength(actualPartSize)
14781478 if err != nil {
1479− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1479+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
14801480 return
14811481 }
14821482
@@ -1492,7 +1492,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 9 unmodified lines
14921492 var li ListPartsInfo
14931493 li, err = objectAPI.ListObjectParts(ctx, dstBucket, dstObject, uploadID, 0, 1)
14941494 if err != nil {
1495− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1495+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
14961496 return
14971497 }
14981498
@@ -1522,7 +1522,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 23 unmodified lines
15221522
15231523 srcInfo.Reader, err = hash.NewReader(reader, length, "", "", actualPartSize)
15241524 if err != nil {
1525− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1525+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
15261526 return
15271527 }
15281528
@@ -1540,14 +1540,14 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 11 unmodified lines
15401540 if crypto.SSEC.IsRequested(r.Header) {
15411541 key, err = ParseSSECustomerRequest(r)
15421542 if err != nil {
1543− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1543+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
15441544 return
15451545 }
15461546 }
15471547 var objectEncryptionKey []byte
15481548 objectEncryptionKey, err = decryptObjectInfo(key, dstBucket, dstObject, li.UserDefined)
15491549 if err != nil {
1550− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1550+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
15511551 return
15521552 }
15531553
@@ -1559,14 +1559,14 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 5 unmodified lines
15591559 partEncryptionKey := mac.Sum(nil)
15601560 reader, err = sio.EncryptReader(reader, sio.Config{Key: partEncryptionKey})
15611561 if err != nil {
1562− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1562+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
15631563 return
15641564 }
15651565
15661566 info := ObjectInfo{Size: length}
15671567 srcInfo.Reader, err = hash.NewReader(reader, info.EncryptedSize(), "", "", length)
15681568 if err != nil {
1569− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1569+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
15701570 return
15711571 }
15721572 }
@@ -1577,7 +1577,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt · 4 unmodified lines
15771577 partInfo, err := objectAPI.CopyObjectPart(ctx, srcBucket, srcObject, dstBucket, dstObject, uploadID, partID,
15781578 startOffset, length, srcInfo, srcOpts, dstOpts)
15791579 if err != nil {
1580− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1580+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
15811581 return
15821582 }
15831583
@@ -1634,7 +1634,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 50 unmodified lines
16341634 }
16351635 size, err = strconv.ParseInt(sizeStr[0], 10, 64)
16361636 if err != nil {
1637− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1637+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
16381638 return
16391639 }
16401640 }
@@ -1709,7 +1709,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 68 unmodified lines
17091709 var li ListPartsInfo
17101710 li, err = objectAPI.ListObjectParts(ctx, bucket, object, uploadID, 0, 1)
17111711 if err != nil {
1712− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1712+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
17131713 return
17141714 }
17151715 // Read compression metadata preserved in the init multipart for the decision.
@@ -1723,7 +1723,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 7 unmodified lines
17231723 var actualReader *hash.Reader
17241724 actualReader, err = hash.NewReader(reader, size, md5hex, sha256hex, actualSize)
17251725 if err != nil {
1726− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1726+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
17271727 return
17281728 }
17291729
@@ -1744,7 +1744,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 14 unmodified lines
17441744
17451745 hashReader, err := hash.NewReader(reader, size, md5hex, sha256hex, actualSize)
17461746 if err != nil {
1747− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1747+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
17481748 return
17491749 }
17501750
@@ -1762,7 +1762,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 11 unmodified lines
17621762 var li ListPartsInfo
17631763 li, err = objectAPI.ListObjectParts(ctx, bucket, object, uploadID, 0, 1)
17641764 if err != nil {
1765− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1765+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
17661766 return
17671767 }
17681768 if crypto.IsEncrypted(li.UserDefined) {
@@ -1775,7 +1775,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 6 unmodified lines
17751775 if crypto.SSEC.IsRequested(r.Header) {
17761776 key, err = ParseSSECustomerRequest(r)
17771777 if err != nil {
1778− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1778+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
17791779 return
17801780 }
17811781 }
@@ -1784,7 +1784,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 2 unmodified lines
17841784 var objectEncryptionKey []byte
17851785 objectEncryptionKey, err = decryptObjectInfo(key, bucket, object, li.UserDefined)
17861786 if err != nil {
1787− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1787+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
17881788 return
17891789 }
17901790
@@ -1797,14 +1797,14 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 6 unmodified lines
17971797
17981798 reader, err = sio.EncryptReader(hashReader, sio.Config{Key: partEncryptionKey})
17991799 if err != nil {
1800− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1800+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
18011801 return
18021802 }
18031803
18041804 info := ObjectInfo{Size: size}
18051805 hashReader, err = hash.NewReader(reader, info.EncryptedSize(), "", "", size) // do not try to verify encrypted content
18061806 if err != nil {
1807− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1807+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
18081808 return
18091809 }
18101810 }
@@ -1817,7 +1817,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http · 6 unmodified lines
18171817 partInfo, err := putObjectPart(ctx, bucket, object, uploadID, partID, hashReader, opts)
18181818 if err != nil {
18191819 // Verify if the underlying error is signature mismatch.
1820− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1820+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
18211821 return
18221822 }
18231823 if isCompressed {
@@ -1871,7 +1871,7 @@ func (api objectAPIHandlers) AbortMultipartUploadHandler(w http.ResponseWriter, · 47 unmodified lines
18711871 return
18721872 }
18731873 if err := abortMultipartUpload(ctx, bucket, object, uploadID); err != nil {
1874− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1874+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
18751875 return
18761876 }
18771877
@@ -1914,7 +1914,7 @@ func (api objectAPIHandlers) ListObjectPartsHandler(w http.ResponseWriter, r *ht · 36 unmodified lines
19141914 }
19151915 listPartsInfo, err := objectAPI.ListObjectParts(ctx, bucket, object, uploadID, partNumberMarker, maxParts)
19161916 if err != nil {
1917− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
1917+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
19181918 return
19191919 }
19201920 response := generateListPartsResponse(listPartsInfo)
@@ -2003,7 +2003,7 @@ func (api objectAPIHandlers) CompleteMultipartUploadHandler(w http.ResponseWrite · 82 unmodified lines
20032003 writePartSmallErrorResponse(w, r, oErr)
20042004 default:
20052005 // Handle all other generic issues.
2006− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
2006+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
20072007 }
20082008 return
20092009 }
@@ -2080,7 +2080,7 @@ func (api objectAPIHandlers) DeleteObjectHandler(w http.ResponseWriter, r *http. · 70 unmodified lines
20802080 if err == dns.ErrNoEntriesFound {
20812081 writeErrorResponse(w, ErrNoSuchBucket, r.URL)
20822082 } else {
2083− writeErrorResponse(w, toAPIErrorCode(err), r.URL)
2083+ writeErrorResponse(w, toAPIErrorCode(ctx, err), r.URL)
20842084 }
20852085 return
20862086 }
@@ -2088,7 +2088,7 @@ func (api objectAPIHandlers) DeleteObjectHandler(w http.ResponseWriter, r *http. · 1 unmodified line
20882088
20892089 // http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectDELETE.html
20902090 if err := deleteObject(ctx, objectAPI, api.CacheAPI(), bucket, object, r); err != nil {
2091− switch toAPIErrorCode(err) {
2091+ switch toAPIErrorCode(ctx, err) {
20922092 case ErrNoSuchBucket:
20932093 // When bucket doesn't exist specially handle it.
20942094 writeErrorResponse(w, ErrNoSuchBucket, r.URL)
cmd/object-handlers_test.go+6−4
@@ -2533,6 +2533,8 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s · 2532 unmodified lines
25332533 successResponse := generateCompleteMultpartUploadResponse(bucketName, objectName, getGetObjectURL("", bucketName, objectName), s3MD5)
25342534 encodedSuccessResponse := encodeResponse(successResponse)
25352535
2536+ ctx := context.Background()
2537+
25362538 testCases := []struct {
25372539 bucket string
25382540 object string
@@ -2555,7 +2557,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s · 16 unmodified lines
25552557 accessKey: credentials.AccessKey,
25562558 secretKey: credentials.SecretKey,
25572559
2558− expectedContent: encodeResponse(getAPIErrorResponse(getAPIError(toAPIErrorCode(InvalidPart{})),
2560+ expectedContent: encodeResponse(getAPIErrorResponse(getAPIError(toAPIErrorCode(ctx, InvalidPart{})),
25592561 getGetObjectURL("", bucketName, objectName), "")),
25602562 expectedRespStatus: http.StatusBadRequest,
25612563 },
@@ -2585,7 +2587,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s · 23 unmodified lines
25852587 accessKey: credentials.AccessKey,
25862588 secretKey: credentials.SecretKey,
25872589
2588− expectedContent: encodeResponse(getAPIErrorResponse(getAPIError(toAPIErrorCode(InvalidUploadID{UploadID: "abc"})),
2590+ expectedContent: encodeResponse(getAPIErrorResponse(getAPIError(toAPIErrorCode(ctx, InvalidUploadID{UploadID: "abc"})),
25892591 getGetObjectURL("", bucketName, objectName), "")),
25902592 expectedRespStatus: http.StatusNotFound,
25912593 },
@@ -2600,7 +2602,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s · 8 unmodified lines
26002602 secretKey: credentials.SecretKey,
26012603
26022604 expectedContent: encodeResponse(completeMultipartAPIError{int64(4), int64(5242880), 1, "e2fc714c4727ee9395f324cd2e7f331f",
2603− getAPIErrorResponse(getAPIError(toAPIErrorCode(PartTooSmall{PartNumber: 1})),
2605+ getAPIErrorResponse(getAPIError(toAPIErrorCode(ctx, PartTooSmall{PartNumber: 1})),
26042606 getGetObjectURL("", bucketName, objectName), "")}),
26052607 expectedRespStatus: http.StatusBadRequest,
26062608 },
@@ -2614,7 +2616,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s · 7 unmodified lines
26142616 accessKey: credentials.AccessKey,
26152617 secretKey: credentials.SecretKey,
26162618
2617− expectedContent: encodeResponse(getAPIErrorResponse(getAPIError(toAPIErrorCode(InvalidPart{})),
2619+ expectedContent: encodeResponse(getAPIErrorResponse(getAPIError(toAPIErrorCode(ctx, InvalidPart{})),
26182620 getGetObjectURL("", bucketName, objectName), "")),
26192621 expectedRespStatus: http.StatusBadRequest,
26202622 },
cmd/test-utils_test.go+3−2
@@ -2354,8 +2354,9 @@ func TestToErrIsNil(t *testing.T) { · 2353 unmodified lines
23542354 if toStorageErr(nil) != nil {
23552355 t.Errorf("Test expected to return nil, failed instead got a non-nil value %s", toStorageErr(nil))
23562356 }
2357− if toAPIErrorCode(nil) != ErrNone {
2358− t.Errorf("Test expected error code to be ErrNone, failed instead provided %d", toAPIErrorCode(nil))
2357+ ctx := context.Background()
2358+ if toAPIErrorCode(ctx, nil) != ErrNone {
2359+ t.Errorf("Test expected error code to be ErrNone, failed instead provided %d", toAPIErrorCode(ctx, nil))
23592360 }
23602361 }
23612362

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t