Repository: hadoop
Updated Branches:
  refs/heads/branch-2 87c2d915f -> 8efcf5bdb


HDFS-7397. Add more detail to the documentation for the conf key 
"dfs.client.read.shortcircuit.streams.cache.size" (Brahma Reddy Battula via 
Colin P. McCabe)

(cherry picked from commit 3fe79e1db84391cb17dbed6b579fe9c803b3d1c2)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8efcf5bd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8efcf5bd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8efcf5bd

Branch: refs/heads/branch-2
Commit: 8efcf5bdbd247915b904eca0b645d2cc3a073b49
Parents: 87c2d91
Author: Colin Patrick Mccabe <[email protected]>
Authored: Mon May 4 12:50:29 2015 -0700
Committer: Colin Patrick Mccabe <[email protected]>
Committed: Mon May 4 12:50:59 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8efcf5bd/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 5738541..2c9ab69 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -173,6 +173,10 @@ Release 2.8.0 - UNRELEASED
     HDFS-8249. Separate HdfsConstants into the client and the server side
     class. (wheat9)
 
+    HDFS-7397. Add more detail to the documentation for the conf key
+    "dfs.client.read.shortcircuit.streams.cache.size" (Brahma Reddy Battula via
+    Colin P. McCabe)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8efcf5bd/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------
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 3f4d771..b315f61 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
@@ -2054,7 +2054,7 @@
   <value>256</value>
   <description>
     The DFSClient maintains a cache of recently opened file descriptors.
-    This parameter controls the size of that cache.
+    This parameter controls the maximum number of file descriptors in the 
cache.
     Setting this higher will use more file descriptors,
     but potentially provide better performance on workloads
     involving lots of seeks.

Reply via email to