[09/50] [abbrv] hadoop git commit: HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value greater or equal to 1 there is mismatch in the UI report (Contributed by J.Andreina)

2015-03-27 Thread zjshen 
HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value 
greater or equal to 1 there is mismatch in the UI report (Contributed by 
J.Andreina)


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

Branch: refs/heads/YARN-2928
Commit: 37ba77f91c1c31dcfaafa6571a4aa32da708ae6c
Parents: 2c5a7b6
Author: Vinayakumar B vinayakum...@apache.org
Authored: Tue Mar 24 12:12:01 2015 +0530
Committer: Zhijie Shen zjs...@apache.org
Committed: Thu Mar 26 23:29:44 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  | 4 
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +-
 .../src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java   | 2 +-
 .../apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java| 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/37ba77f9/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 3ea1346..ee9a5db 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -338,6 +338,10 @@ Release 2.8.0 - UNRELEASED
 HDFS-7867. Update action param from start to prepare in rolling upgrade
 javadoc (J.Andreina via vinayakumarb)
 
+HDFS-3325. When configuring dfs.namenode.safemode.threshold-pct to a 
value
+greater or equal to 1 there is mismatch in the UI report
+(J.Andreina via vinayakumarb)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/37ba77f9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 71c84b1..34b5e95 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -5417,7 +5417,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 msg += String.format(
   The reported blocks %d needs additional %d
   +  blocks to reach the threshold %.4f of total blocks %d.%n,
-  blockSafe, (blockThreshold - blockSafe) + 1, threshold, blockTotal);
+blockSafe, (blockThreshold - blockSafe), threshold, 
blockTotal);
 thresholdsMet = false;
   } else {
 msg += String.format(The reported blocks %d has reached the threshold

http://git-wip-us.apache.org/repos/asf/hadoop/blob/37ba77f9/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
index 2d5bef2..80fe9ee 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
@@ -198,7 +198,7 @@ public class TestSafeMode {
 
 String status = nn.getNamesystem().getSafemode();
 assertEquals(Safe mode is ON. The reported blocks 0 needs additional  +
-15 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
+14 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
 The number of live datanodes 0 has reached the minimum number 0.  +
 Safe mode will be turned off automatically once the thresholds  +
 have been reached., status);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/37ba77f9/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
index c5aad9c..86f3e7b 100644
---

[31/51] [abbrv] hadoop git commit: HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value greater or equal to 1 there is mismatch in the UI report (Contributed by J.Andreina)

2015-03-25 Thread kasha 
HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value 
greater or equal to 1 there is mismatch in the UI report (Contributed by 
J.Andreina)


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

Branch: refs/heads/YARN-2139
Commit: c6c396fcd69514ba93583268b2633557c3d74a47
Parents: fbceb3b
Author: Vinayakumar B vinayakum...@apache.org
Authored: Tue Mar 24 12:12:01 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Tue Mar 24 12:12:01 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  | 4 
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +-
 .../src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java   | 2 +-
 .../apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java| 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/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 3ea1346..ee9a5db 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -338,6 +338,10 @@ Release 2.8.0 - UNRELEASED
 HDFS-7867. Update action param from start to prepare in rolling upgrade
 javadoc (J.Andreina via vinayakumarb)
 
+HDFS-3325. When configuring dfs.namenode.safemode.threshold-pct to a 
value
+greater or equal to 1 there is mismatch in the UI report
+(J.Andreina via vinayakumarb)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 71c84b1..34b5e95 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -5417,7 +5417,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 msg += String.format(
   The reported blocks %d needs additional %d
   +  blocks to reach the threshold %.4f of total blocks %d.%n,
-  blockSafe, (blockThreshold - blockSafe) + 1, threshold, blockTotal);
+blockSafe, (blockThreshold - blockSafe), threshold, 
blockTotal);
 thresholdsMet = false;
   } else {
 msg += String.format(The reported blocks %d has reached the threshold

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
index 2d5bef2..80fe9ee 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
@@ -198,7 +198,7 @@ public class TestSafeMode {
 
 String status = nn.getNamesystem().getSafemode();
 assertEquals(Safe mode is ON. The reported blocks 0 needs additional  +
-15 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
+14 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
 The number of live datanodes 0 has reached the minimum number 0.  +
 Safe mode will be turned off automatically once the thresholds  +
 have been reached., status);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
index c5aad9c..86f3e7b 100644
---

hadoop git commit: HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value greater or equal to 1 there is mismatch in the UI report (Contributed by J.Andreina)

2015-03-24 Thread vinayakumarb 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 e7702ac6a - c3e2c20c9


HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value 
greater or equal to 1 there is mismatch in the UI report (Contributed by 
J.Andreina)

(cherry picked from commit c6c396fcd69514ba93583268b2633557c3d74a47)


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

Branch: refs/heads/branch-2
Commit: c3e2c20c9907d106e1cb9da0562c06de4975bc09
Parents: e7702ac
Author: Vinayakumar B vinayakum...@apache.org
Authored: Tue Mar 24 12:12:01 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Tue Mar 24 12:13:21 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  | 4 
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +-
 .../src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java   | 2 +-
 .../apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java| 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3e2c20c/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 17adae8..8977904 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -25,6 +25,10 @@ Release 2.8.0 - UNRELEASED
 HDFS-7867. Update action param from start to prepare in rolling upgrade
 javadoc (J.Andreina via vinayakumarb)
 
+HDFS-3325. When configuring dfs.namenode.safemode.threshold-pct to a 
value
+greater or equal to 1 there is mismatch in the UI report
+(J.Andreina via vinayakumarb)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3e2c20c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index ad0c344..697b975 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -5417,7 +5417,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 msg += String.format(
   The reported blocks %d needs additional %d
   +  blocks to reach the threshold %.4f of total blocks %d.%n,
-  blockSafe, (blockThreshold - blockSafe) + 1, threshold, blockTotal);
+blockSafe, (blockThreshold - blockSafe), threshold, 
blockTotal);
 thresholdsMet = false;
   } else {
 msg += String.format(The reported blocks %d has reached the threshold

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3e2c20c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
index 2d5bef2..80fe9ee 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
@@ -198,7 +198,7 @@ public class TestSafeMode {
 
 String status = nn.getNamesystem().getSafemode();
 assertEquals(Safe mode is ON. The reported blocks 0 needs additional  +
-15 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
+14 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
 The number of live datanodes 0 has reached the minimum number 0.  +
 Safe mode will be turned off automatically once the thresholds  +
 have been reached., status);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3e2c20c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java

hadoop git commit: HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value greater or equal to 1 there is mismatch in the UI report (Contributed by J.Andreina)

2015-03-24 Thread vinayakumarb 
Repository: hadoop
Updated Branches:
  refs/heads/trunk fbceb3b41 - c6c396fcd


HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value 
greater or equal to 1 there is mismatch in the UI report (Contributed by 
J.Andreina)


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

Branch: refs/heads/trunk
Commit: c6c396fcd69514ba93583268b2633557c3d74a47
Parents: fbceb3b
Author: Vinayakumar B vinayakum...@apache.org
Authored: Tue Mar 24 12:12:01 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Tue Mar 24 12:12:01 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  | 4 
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +-
 .../src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java   | 2 +-
 .../apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java| 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/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 3ea1346..ee9a5db 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -338,6 +338,10 @@ Release 2.8.0 - UNRELEASED
 HDFS-7867. Update action param from start to prepare in rolling upgrade
 javadoc (J.Andreina via vinayakumarb)
 
+HDFS-3325. When configuring dfs.namenode.safemode.threshold-pct to a 
value
+greater or equal to 1 there is mismatch in the UI report
+(J.Andreina via vinayakumarb)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 71c84b1..34b5e95 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -5417,7 +5417,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 msg += String.format(
   The reported blocks %d needs additional %d
   +  blocks to reach the threshold %.4f of total blocks %d.%n,
-  blockSafe, (blockThreshold - blockSafe) + 1, threshold, blockTotal);
+blockSafe, (blockThreshold - blockSafe), threshold, 
blockTotal);
 thresholdsMet = false;
   } else {
 msg += String.format(The reported blocks %d has reached the threshold

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
index 2d5bef2..80fe9ee 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
@@ -198,7 +198,7 @@ public class TestSafeMode {
 
 String status = nn.getNamesystem().getSafemode();
 assertEquals(Safe mode is ON. The reported blocks 0 needs additional  +
-15 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
+14 blocks to reach the threshold 0.9990 of total blocks 15. + 
NEWLINE +
 The number of live datanodes 0 has reached the minimum number 0.  +
 Safe mode will be turned off automatically once the thresholds  +
 have been reached., status);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c396fc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java
index c5aad9c..86f3e7b