File tree Expand file tree Collapse file tree 2 files changed +2
-6
lines changed
modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3 Expand file tree Collapse file tree 2 files changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -899,11 +899,10 @@ public void compareAndExchangeRegister(
899
899
logger .trace (() -> Strings .format ("[%s]: compareAndExchangeRegister failed" , key ), e );
900
900
if (e instanceof AmazonS3Exception amazonS3Exception
901
901
&& (amazonS3Exception .getStatusCode () == 404
902
- || amazonS3Exception .getStatusCode () == 0 && "NoSuchUpload" .equals (amazonS3Exception .getErrorCode ()))) {
902
+ || amazonS3Exception .getStatusCode () == 200 && "NoSuchUpload" .equals (amazonS3Exception .getErrorCode ()))) {
903
903
// An uncaught 404 means that our multipart upload was aborted by a concurrent operation before we could complete it.
904
904
// Also (rarely) S3 can start processing the request during a concurrent abort and this can result in a 200 OK with an
905
- // <Error><Code>NoSuchUpload</Code>... in the response, which the SDK translates to status code 0. Either way, this means
906
- // that our write encountered contention:
905
+ // <Error><Code>NoSuchUpload</Code>... in the response. Either way, this means that our write encountered contention:
907
906
delegate .onResponse (OptionalBytesReference .MISSING );
908
907
} else {
909
908
delegate .onFailure (e );
Original file line number Diff line number Diff line change @@ -394,9 +394,6 @@ tests:
394
394
issue : https://github.com/elastic/elasticsearch/issues/122680
395
395
- class : org.elasticsearch.entitlement.qa.EntitlementsDeniedIT
396
396
issue : https://github.com/elastic/elasticsearch/issues/122566
397
- - class : org.elasticsearch.repositories.blobstore.testkit.analyze.S3RepositoryAnalysisRestIT
398
- method : testRepositoryAnalysis
399
- issue : https://github.com/elastic/elasticsearch/issues/122799
400
397
- class : org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
401
398
issue : https://github.com/elastic/elasticsearch/issues/122810
402
399
You can’t perform that action at this time.
0 commit comments