HADOOP-19045. CreateSession Timeout - followup

Remove all declarations of fs.s3a.connection.request.timeout
in
- hadoop-common/src/main/resources/core-default.xml
- hadoop-aws/src/test/resources/core-site.xml

New test in TestAwsClientConfig to verify that the value
defined in fs.s3a.Constants class is used.

This is brittle to someone overriding it in their test setups,
but as this test is intended to verify that the option is not
explicitly set, there's no workaround.

Contributed by Steve Loughran

Change-Id: I89761bf4d554c671786cedac3c3fb4215a863964

Author: steveloughran

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

@@ -2097,20 +2097,6 @@
   </description>
 </property>
 
-<property>
-  <name>fs.s3a.connection.request.timeout</name>
-  <value>0s</value>
-  <description>
-    Time out on HTTP requests to the AWS service; 0 means no timeout.
-
-    Important: this is the maximum duration of any AWS service call,
-    including upload and copy operations. If non-zero, it must be larger
-    than the time to upload multi-megabyte blocks to S3 from the client,
-    and to rename many-GB files. Use with care.
-
-  </description>
-</property>
-
 <property>
   <name>fs.s3a.etag.checksum.enabled</name>
   <value>false</value>

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/TestAwsClientConfig.java

@@ -40,6 +40,7 @@
 import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_CONNECTION_TTL_DURATION;
 import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_ESTABLISH_TIMEOUT_DURATION;
 import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_MAXIMUM_CONNECTIONS;
+import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_REQUEST_TIMEOUT_DURATION;
 import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_SOCKET_TIMEOUT_DURATION;
 import static org.apache.hadoop.fs.s3a.Constants.ESTABLISH_TIMEOUT;
 import static org.apache.hadoop.fs.s3a.Constants.MAXIMUM_CONNECTIONS;
@@ -175,6 +176,21 @@ public void testCreateApiConnectionSettings() {
         .describedAs("%s in %s", REQUEST_TIMEOUT, settings)
         .isEqualTo(Duration.ofHours(1));
   }
+  /**
+   * Verify that the timeout from {@link org.apache.hadoop.fs.s3a.Constants#DEFAULT_REQUEST_TIMEOUT_DURATION}
+   * makes it all the way through and that nothing in in core-default or core-site is setting it.
+   * This test will fail if someone does set it in core-site.xml
+   */
+  @Test
+  public void testCreateApiConnectionSettingsDefault() {
+    final Configuration conf = new Configuration();
+    Assertions.assertThat(conf.get(REQUEST_TIMEOUT))
+        .describedAs("Request timeout %s", REQUEST_TIMEOUT)
+        .isNull();
+
+    assertDuration(REQUEST_TIMEOUT, DEFAULT_REQUEST_TIMEOUT_DURATION,
+        createApiConnectionSettings(conf).getApiCallTimeout());
+  }
 
   /**
    * Set a list of keys to the same value.

hadoop-tools/hadoop-aws/src/test/resources/core-site.xml

@@ -201,11 +201,6 @@
     <value>true</value>
   </property>
 
-  <property>
-    <name>fs.s3a.connection.request.timeout</name>
-    <value>10s</value>
-  </property>
-
   <property>
     <name>fs.s3a.attempts.maximum</name>
     <value>1</value>