HADOOP-18416. fix ITestS3AIOStatisticsContext test failure (#4931)

steveloughran · steveloughran · commit d149c68dc1cf · 2023-04-25T15:03:53.000+01:00
Uncomment the S3ATestUtils-side part of the original patch.
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
@@ -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);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1508,7 +1508,6 @@ public static S3AInputStream getS3AInputStream(`
`1508`	`1508`	`* @param conf Configuration to remove the prefetch property from.`
`1509`	`1509`	`*/`
`1510`	`1510`	`public static void disablePrefetching(Configuration conf) {`
`1511`		`- // TODO: Reinstate once HADOOP-18028 is merged.`
`1512`		`- // removeBaseAndBucketOverrides(conf, PREFETCH_ENABLED_KEY);`
	`1511`	`+ removeBaseAndBucketOverrides(conf, PREFETCH_ENABLED_KEY);`
`1513`	`1512`	`}`
`1514`	`1513`	`}`