From bb08c9022819e7eb5897cf77da944f89cfc46de9 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@cloudera.com>
Date: Mon, 24 Apr 2023 19:55:23 +0100
Subject: [PATCH] HADOOP-18416. fix ITestS3AIOStatisticsContext test failure
 (#4931)

Uncomment the S3ATestUtils-side part of the original patch.
---
 .../src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
index 4940eeb2e8..469562f9b3 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
@@ -1508,7 +1508,6 @@ public static S3AInputStream getS3AInputStream(
    * @param conf Configuration to remove the prefetch property from.
    */
   public static void disablePrefetching(Configuration conf) {
-    // TODO: Reinstate once HADOOP-18028 is merged.
-    // removeBaseAndBucketOverrides(conf, PREFETCH_ENABLED_KEY);
+    removeBaseAndBucketOverrides(conf, PREFETCH_ENABLED_KEY);
   }
 }