From ef9a6e775c136b2a591a76d5e34d07974a356e0d Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Sat, 25 Apr 2020 13:07:32 +0530
Subject: [PATCH] HADOOP-16886. Add hadoop.http.idle_timeout.ms to
 core-default.xml. Contributed by Lisheng Sun.

---
 .../apache/hadoop/fs/CommonConfigurationKeysPublic.java  | 9 +++++++++
 .../hadoop-common/src/main/resources/core-default.xml    | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
index a68012b06d2..ce132f9a378 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
@@ -988,5 +988,14 @@ public class CommonConfigurationKeysPublic {
   public static final String HADOOP_PROMETHEUS_ENABLED =
       "hadoop.prometheus.endpoint.enabled";
   public static final boolean HADOOP_PROMETHEUS_ENABLED_DEFAULT = false;
+
+  /**
+   * @see
+   * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/core-default.xml">
+   * core-default.xml</a>
+   */
+  public static final String HADOOP_HTTP_IDLE_TIMEOUT_MS_KEY =
+      "hadoop.http.idle_timeout.ms";
+  public static final int HADOOP_HTTP_IDLE_TIMEOUT_MS_DEFAULT = 1000;
 }
 
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index aba3b52dfc9..0d583cca57c 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -48,6 +48,14 @@
   ordering of the filters.</description>
 </property>
 
+  <property>
+    <name>hadoop.http.idle_timeout.ms</name>
+    <value>1000</value>
+    <description>
+      NN/JN/DN Server connection timeout in milliseconds.
+    </description>
+  </property>
+
 <!--- security properties -->
 
 <property>