Repository: hadoop Updated Branches: refs/remotes/origin/branch-3.1 6f31faf92 -> a869bd970
HDFS-13719. Docs around dfs.image.transfer.timeout are misleading. Contributed by Kitti Nansi. (cherry picked from commit eecb5baaaaa54599aeae758abd4007e55e5b531f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/242b5acd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/242b5acd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/242b5acd Branch: refs/remotes/origin/branch-3.1 Commit: 242b5acdb358d886b6cc23707bc4e7b484ff514e Parents: e994c4f Author: Andrew Wang <w...@apache.org> Authored: Mon Jul 9 15:17:21 2018 +0200 Committer: Andrew Wang <w...@apache.org> Committed: Mon Jul 9 15:17:34 2018 +0200 ---------------------------------------------------------------------- .../hadoop-hdfs/src/main/resources/hdfs-default.xml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/242b5acd/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 d17020d..c092bff 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 @@ -1286,11 +1286,10 @@ <name>dfs.image.transfer.timeout</name> <value>60000</value> <description> - Socket timeout for image transfer in milliseconds. This timeout and the related - dfs.image.transfer.bandwidthPerSec parameter should be configured such - that normal image transfer can complete successfully. - This timeout prevents client hangs when the sender fails during - image transfer. This is socket timeout during image transfer. + Socket timeout for the HttpURLConnection instance used in the image + transfer. This is measured in milliseconds. + This timeout prevents client hangs if the connection is idle + for this configured timeout, during image transfer. </description> </property> @@ -1301,9 +1300,7 @@ Maximum bandwidth used for regular image transfers (instead of bootstrapping the standby namenode), in bytes per second. This can help keep normal namenode operations responsive during - checkpointing. The maximum bandwidth and timeout in - dfs.image.transfer.timeout should be set such that normal image - transfers can complete successfully. + checkpointing. A default value of 0 indicates that throttling is disabled. The maximum bandwidth used for bootstrapping standby namenode is configured with dfs.image.transfer-bootstrap-standby.bandwidthPerSec. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org