From 59ce780d53fda1d2823e5da23d03ca68b15a4bf9 Mon Sep 17 00:00:00 2001
From: Zhe Zhang <zhz@apache.org>
Date: Wed, 21 Oct 2015 14:03:12 -0700
Subject: [PATCH] HDFS-9274. Default value of
 dfs.datanode.directoryscan.throttle.limit.ms.per.sec should be consistent.
 Contributed by Yi Liu.

Change-Id: Iafa2efb8f2eafd193b417690cc8794080b9d745b
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                    | 3 +++
 .../hadoop-hdfs/src/main/resources/hdfs-default.xml            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 988f2496e87..55211b192bf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2095,6 +2095,9 @@ Release 2.8.0 - UNRELEASED
 
     HDFS-3059. ssl-server.xml causes NullPointer. (Xiao Chen via wang)
 
+    HDFS-9274. Default value of dfs.datanode.directoryscan.throttle.limit.ms.per.sec
+    should be consistent. (Yi Liu via zhz)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index cd88e52c12f..0a9ca249af8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -637,7 +637,7 @@
 
 <property>
   <name>dfs.datanode.directoryscan.throttle.limit.ms.per.sec</name>
-  <value>0</value>
+  <value>1000</value>
   <description>The report compilation threads are limited to only running for
   a given number of milliseconds per second, as configured by the
   property. The limit is taken per thread, not in aggregate, e.g. setting