Misc cleanups in S3BlobContainerRetriesTests

- Simplify multi-object-delete request detection
- Replace `AtomicBoolean` with volatile field
- Make `ThrottlingDeleteHandler` static

Author: DaveCTurner

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

@@ -117,19 +117,19 @@ public class S3BlobContainerRetriesTests extends AbstractBlobContainerRetriesTes
 
     private static final int MAX_NUMBER_SNAPSHOT_DELETE_RETRIES = 10;
     private S3Service service;
-    private AtomicBoolean shouldErrorOnDns;
+    private volatile boolean shouldErrorOnDns;
     private RecordingMeterRegistry recordingMeterRegistry;
 
     @Before
     public void setUp() throws Exception {
-        shouldErrorOnDns = new AtomicBoolean(false);
+        shouldErrorOnDns = false;
         service = new S3Service(Mockito.mock(Environment.class), Settings.EMPTY, Mockito.mock(ResourceWatcherService.class)) {
             @Override
             protected AmazonS3ClientBuilder buildClientBuilder(S3ClientSettings clientSettings) {
                 final AmazonS3ClientBuilder builder = super.buildClientBuilder(clientSettings);
                 final DnsResolver defaultDnsResolver = builder.getClientConfiguration().getDnsResolver();
                 builder.getClientConfiguration().setDnsResolver(host -> {
-                    if (shouldErrorOnDns.get() && randomBoolean() && randomBoolean()) {
+                    if (shouldErrorOnDns && randomBoolean() && randomBoolean()) {
                         throw new UnknownHostException(host);
                     }
                     return defaultDnsResolver.resolve(host);
@@ -721,7 +721,7 @@ public void testReadWithIndicesPurposeRetriesForever() throws IOException {
 
         final byte[] bytes = randomBlobContent(512);
 
-        shouldErrorOnDns.set(true);
+        shouldErrorOnDns = true;
         final AtomicInteger failures = new AtomicInteger();
         @SuppressForbidden(reason = "use a http server")
         class FlakyReadHandler implements HttpHandler {
@@ -949,7 +949,7 @@ private int expectedNumberOfBatches(int blobsToDelete) {
     }
 
     @SuppressForbidden(reason = "use a http server")
-    private class ThrottlingDeleteHandler extends S3HttpHandler {
+    private static class ThrottlingDeleteHandler extends S3HttpHandler {
 
         private static final String THROTTLING_ERROR_CODE = "SlowDown";
 
@@ -974,7 +974,7 @@ private class ThrottlingDeleteHandler extends S3HttpHandler {
 
         @Override
         public void handle(HttpExchange exchange) throws IOException {
-            if (exchange.getRequestMethod().equals("POST") && exchange.getRequestURI().toString().startsWith("/bucket/?delete")) {
+            if (isMultiDeleteRequest(exchange)) {
                 onAttemptCallback.accept(numberOfDeleteAttempts.get());
                 numberOfDeleteAttempts.incrementAndGet();
                 if (throttleTimesBeforeSuccess.getAndDecrement() > 0) {
@@ -1078,7 +1078,7 @@ public void testSuppressedDeletionErrorsAreCapped() {
         int maxBulkDeleteSize = randomIntBetween(1, 10);
         final BlobContainer blobContainer = createBlobContainer(1, readTimeout, true, null, maxBulkDeleteSize);
         httpServer.createContext("/", exchange -> {
-            if (exchange.getRequestMethod().equals("POST") && exchange.getRequestURI().toString().startsWith("/bucket/?delete")) {
+            if (isMultiDeleteRequest(exchange)) {
                 exchange.sendResponseHeaders(
                     randomFrom(
                         HttpStatus.SC_INTERNAL_SERVER_ERROR,
@@ -1112,7 +1112,7 @@ public void testTrimmedLogAndCappedSuppressedErrorOnMultiObjectDeletionException
 
         final Pattern pattern = Pattern.compile("<Key>(.+?)</Key>");
         httpServer.createContext("/", exchange -> {
-            if (exchange.getRequestMethod().equals("POST") && exchange.getRequestURI().toString().startsWith("/bucket/?delete")) {
+            if (isMultiDeleteRequest(exchange)) {
                 final String requestBody = Streams.copyToString(new InputStreamReader(exchange.getRequestBody(), StandardCharsets.UTF_8));
                 final var matcher = pattern.matcher(requestBody);
                 final StringBuilder deletes = new StringBuilder();
@@ -1249,6 +1249,10 @@ private Map<String, Object> metricAttributes(String action) {
         return Map.of("repo_type", "s3", "repo_name", "repository", "operation", "GetObject", "purpose", "Indices", "action", action);
     }
 
+    private static boolean isMultiDeleteRequest(HttpExchange exchange) {
+        return new S3HttpHandler("bucket").parseRequest(exchange).isMultiObjectDeleteRequest();
+    }
+
     /**
      * Asserts that an InputStream is fully consumed, or aborted, when it is closed
      */