Reinstate & fix testWriteLargeBlob{,Streaming}

Author: DaveCTurner

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java

@@ -566,7 +566,11 @@ static Operation parse(String s) {
             );
         }
 
-        private static final Predicate<String> IS_PUT_MULTIPART_OPERATION = Set.of("CreateMultipartUpload", "UploadPart")::contains;
+        private static final Predicate<String> IS_PUT_MULTIPART_OPERATION = Set.of(
+            "CreateMultipartUpload",
+            "UploadPart",
+            "CompleteMultipartUpload"
+        )::contains;
 
         boolean assertConsistentOperationName(MetricCollection metricCollection) {
             final var operationNameMetrics = metricCollection.metricValues(CoreMetric.OPERATION_NAME);

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java

@@ -323,7 +323,6 @@ public void testWriteBlobWithReadTimeouts() {
         assertThat(exception.getCause().getCause().getMessage().toLowerCase(Locale.ROOT), containsString("read timed out"));
     }
 
-    @AwaitsFix(bugUrl = "TODO NOMERGE")
     public void testWriteLargeBlob() throws Exception {
         final boolean useTimeout = rarely();
         final TimeValue readTimeout = useTimeout ? TimeValue.timeValueMillis(randomIntBetween(100, 500)) : null;
@@ -425,7 +424,6 @@ public void testWriteLargeBlob() throws Exception {
         assertThat(countDownComplete.isCountedDown(), is(true));
     }
 
-    @AwaitsFix(bugUrl = "TODO NOMERGE")
     public void testWriteLargeBlobStreaming() throws Exception {
         final boolean useTimeout = rarely();
         final TimeValue readTimeout = useTimeout ? TimeValue.timeValueMillis(randomIntBetween(100, 500)) : null;