@@ -48,9 +48,7 @@ const (
48
48
aborted completionStatus = "ABORTED"
49
49
50
50
// API constants
51
- uploadsApi = "/api/v1/uploads/"
52
- routeToHeader = "X-JFrog-Route-To"
53
- artifactoryNodeId = "X-Artifactory-Node-Id"
51
+ uploadsApi = "/api/v1/uploads/"
54
52
55
53
// Sizes and limits constants
56
54
MaxMultipartUploadFileSize = SizeTiB * 5
@@ -305,18 +303,17 @@ type urlPartResponse struct {
305
303
}
306
304
307
305
func (mu * MultipartUpload ) completeAndPollForStatus (logMsgPrefix string , completionAttemptsLeft uint , sha1 string , multipartUploadClient * httputils.HttpClientDetails , progressReader ioutils.Progress ) (err error ) {
308
- nodeId , err : = mu .completeMultipartUpload (logMsgPrefix , sha1 , multipartUploadClient )
306
+ err = mu .completeMultipartUpload (logMsgPrefix , sha1 , multipartUploadClient )
309
307
if err != nil {
310
308
return
311
309
}
312
310
313
- err = mu .pollCompletionStatus (logMsgPrefix , completionAttemptsLeft , sha1 , nodeId , multipartUploadClient , progressReader )
311
+ err = mu .pollCompletionStatus (logMsgPrefix , completionAttemptsLeft , sha1 , multipartUploadClient , progressReader )
314
312
return
315
313
}
316
314
317
- func (mu * MultipartUpload ) pollCompletionStatus (logMsgPrefix string , completionAttemptsLeft uint , sha1 , nodeId string , multipartUploadClient * httputils.HttpClientDetails , progressReader ioutils.Progress ) error {
315
+ func (mu * MultipartUpload ) pollCompletionStatus (logMsgPrefix string , completionAttemptsLeft uint , sha1 string , multipartUploadClient * httputils.HttpClientDetails , progressReader ioutils.Progress ) error {
318
316
multipartUploadClientWithNodeId := multipartUploadClient .Clone ()
319
- multipartUploadClientWithNodeId .Headers = map [string ]string {routeToHeader : nodeId }
320
317
321
318
lastMergeLog := time .Now ()
322
319
pollingExecutor := & utils.RetryExecutor {
@@ -360,22 +357,22 @@ func (mu *MultipartUpload) pollCompletionStatus(logMsgPrefix string, completionA
360
357
return pollingExecutor .Execute ()
361
358
}
362
359
363
- func (mu * MultipartUpload ) completeMultipartUpload (logMsgPrefix , sha1 string , multipartUploadClient * httputils.HttpClientDetails ) ( string , error ) {
360
+ func (mu * MultipartUpload ) completeMultipartUpload (logMsgPrefix , sha1 string , multipartUploadClient * httputils.HttpClientDetails ) error {
364
361
url := fmt .Sprintf ("%s%scomplete?sha1=%s" , mu .artifactoryUrl , uploadsApi , sha1 )
365
362
resp , body , err := mu .client .GetHttpClient ().SendPost (url , []byte {}, * multipartUploadClient , logMsgPrefix )
366
363
if err != nil {
367
- return "" , err
364
+ return err
368
365
}
369
366
log .Debug ("Artifactory response:" , string (body ), resp .Status )
370
- return resp . Header . Get ( artifactoryNodeId ), errorutils .CheckResponseStatusWithBody (resp , body , http .StatusAccepted )
367
+ return errorutils .CheckResponseStatusWithBody (resp , body , http .StatusAccepted )
371
368
}
372
369
373
370
func (mu * MultipartUpload ) status (logMsgPrefix string , multipartUploadClientWithNodeId * httputils.HttpClientDetails ) (status statusResponse , err error ) {
374
371
url := fmt .Sprintf ("%s%sstatus" , mu .artifactoryUrl , uploadsApi )
375
372
resp , body , err := mu .client .GetHttpClient ().SendPost (url , []byte {}, * multipartUploadClientWithNodeId , logMsgPrefix )
376
373
// If the Artifactory node returns a "Service unavailable" error (status 503), attempt to retry the upload completion process on a different node.
377
374
if resp != nil && resp .StatusCode == http .StatusServiceUnavailable {
378
- unavailableNodeErr := fmt .Sprintf (logMsgPrefix + fmt . Sprintf ( "The Artifactory node ID '%s' is unavailable.", multipartUploadClientWithNodeId . Headers [ routeToHeader ]) )
375
+ unavailableNodeErr := fmt .Sprintf (logMsgPrefix + " Artifactory is unavailable." )
379
376
return statusResponse {Status : retryableError , Error : unavailableNodeErr }, nil
380
377
}
381
378
if err != nil {
0 commit comments