Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1569391 merging from trunk to branch-2 to fix:HDFS-5803. TestBalancer.testBalancer0 fails. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569393 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2014-02-18 15:42:04 +00:00
parent d34f27becf
commit 5c26966bb7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -183,6 +183,8 @@ Release 2.4.0 - UNRELEASED
HDFS-5780. TestRBWBlockInvalidation times out intemittently. (Mit Desai HDFS-5780. TestRBWBlockInvalidation times out intemittently. (Mit Desai
via kihwal) via kihwal)
HDFS-5803. TestBalancer.testBalancer0 fails. (Chen He via kihwal)
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
View File

@ -74,7 +74,7 @@ public class TestBalancer {
ClientProtocol client; ClientProtocol client;
static final long TIMEOUT = 20000L; //msec static final long TIMEOUT = 40000L; //msec
static final double CAPACITY_ALLOWED_VARIANCE = 0.005; // 0.5% static final double CAPACITY_ALLOWED_VARIANCE = 0.005; // 0.5%
static final double BALANCE_ALLOWED_VARIANCE = 0.11; // 10%+delta static final double BALANCE_ALLOWED_VARIANCE = 0.11; // 10%+delta
static final int DEFAULT_BLOCK_SIZE = 10; static final int DEFAULT_BLOCK_SIZE = 10;