[06/50] [abbrv] hadoop git commit: HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by Brahma Reddy Battula.

2015-09-15 Thread eclark 
HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by 
Brahma Reddy Battula.


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

Branch: refs/heads/HADOOP-11890
Commit: 0113e4528deda7563b62a29745fbf209ab31b81a
Parents: 94cf7ab
Author: Akira Ajisaka 
Authored: Wed Sep 9 17:20:46 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 9 17:20:46 2015 +0900

--
 .../org/apache/hadoop/hdfs/protocol/DatanodeInfo.java|  6 --
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../apache/hadoop/hdfs/server/namenode/TestMetaSave.java | 11 +++
 3 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
index 3555add..2ef40d2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
@@ -371,9 +371,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 long c = getCapacity();
 long r = getRemaining();
 long u = getDfsUsed();
+float usedPercent = getDfsUsedPercent();
 long cc = getCacheCapacity();
 long cr = getCacheRemaining();
 long cu = getCacheUsed();
+float cacheUsedPercent = getCacheUsedPercent();
 buffer.append(getName());
 if (!NetworkTopology.DEFAULT_RACK.equals(location)) {
   buffer.append(" "+location);
@@ -387,11 +389,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 }
 buffer.append(" " + c + "(" + StringUtils.byteDesc(c)+")");
 buffer.append(" " + u + "(" + StringUtils.byteDesc(u)+")");
-buffer.append(" " + percent2String(u/(double)c));
+buffer.append(" " + percent2String(usedPercent));
 buffer.append(" " + r + "(" + StringUtils.byteDesc(r)+")");
 buffer.append(" " + cc + "(" + StringUtils.byteDesc(cc)+")");
 buffer.append(" " + cu + "(" + StringUtils.byteDesc(cu)+")");
-buffer.append(" " + percent2String(cu/(double)cc));
+buffer.append(" " + percent2String(cacheUsedPercent));
 buffer.append(" " + cr + "(" + StringUtils.byteDesc(cr)+")");
 buffer.append(" " + new Date(lastUpdate));
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/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 14666dd..a07fca2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1358,6 +1358,9 @@ Release 2.7.2 - UNRELEASED
 HDFS-8995. Flaw in registration bookeeping can make DN die on reconnect.
 (Kihwal Lee via yliu)
 
+HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%.
+(Brahma Reddy Battula via aajisaka)
+
 Release 2.7.1 - 2015-07-06
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
index f1d3104..f818987 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -149,6 +150,16 @@ public class TestMetaSave {
   assertTrue(line.equals("Mis-replicated blocks that have been 
postponed:"));
   line = reader.readLine();
   assertTrue(line.equals("Metasave: Blocks being replicated: 0"));
+  line = reader.readLine();
+  assertTrue(line.equals("Metasave: Blocks 2 waiting deletion from 1 
datanodes.")

[19/42] hadoop git commit: HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by Brahma Reddy Battula.

2015-09-11 Thread wangda 
HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by 
Brahma Reddy Battula.


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

Branch: refs/heads/YARN-1197
Commit: 0113e4528deda7563b62a29745fbf209ab31b81a
Parents: 94cf7ab
Author: Akira Ajisaka 
Authored: Wed Sep 9 17:20:46 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 9 17:20:46 2015 +0900

--
 .../org/apache/hadoop/hdfs/protocol/DatanodeInfo.java|  6 --
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../apache/hadoop/hdfs/server/namenode/TestMetaSave.java | 11 +++
 3 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
index 3555add..2ef40d2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
@@ -371,9 +371,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 long c = getCapacity();
 long r = getRemaining();
 long u = getDfsUsed();
+float usedPercent = getDfsUsedPercent();
 long cc = getCacheCapacity();
 long cr = getCacheRemaining();
 long cu = getCacheUsed();
+float cacheUsedPercent = getCacheUsedPercent();
 buffer.append(getName());
 if (!NetworkTopology.DEFAULT_RACK.equals(location)) {
   buffer.append(" "+location);
@@ -387,11 +389,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 }
 buffer.append(" " + c + "(" + StringUtils.byteDesc(c)+")");
 buffer.append(" " + u + "(" + StringUtils.byteDesc(u)+")");
-buffer.append(" " + percent2String(u/(double)c));
+buffer.append(" " + percent2String(usedPercent));
 buffer.append(" " + r + "(" + StringUtils.byteDesc(r)+")");
 buffer.append(" " + cc + "(" + StringUtils.byteDesc(cc)+")");
 buffer.append(" " + cu + "(" + StringUtils.byteDesc(cu)+")");
-buffer.append(" " + percent2String(cu/(double)cc));
+buffer.append(" " + percent2String(cacheUsedPercent));
 buffer.append(" " + cr + "(" + StringUtils.byteDesc(cr)+")");
 buffer.append(" " + new Date(lastUpdate));
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/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 14666dd..a07fca2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1358,6 +1358,9 @@ Release 2.7.2 - UNRELEASED
 HDFS-8995. Flaw in registration bookeeping can make DN die on reconnect.
 (Kihwal Lee via yliu)
 
+HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%.
+(Brahma Reddy Battula via aajisaka)
+
 Release 2.7.1 - 2015-07-06
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
index f1d3104..f818987 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -149,6 +150,16 @@ public class TestMetaSave {
   assertTrue(line.equals("Mis-replicated blocks that have been 
postponed:"));
   line = reader.readLine();
   assertTrue(line.equals("Metasave: Blocks being replicated: 0"));
+  line = reader.readLine();
+  assertTrue(line.equals("Metasave: Blocks 2 waiting deletion from 1 
datanodes."));

hadoop git commit: HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by Brahma Reddy Battula.

2015-09-09 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 ddecd8681 -> eb9e06f8e


HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by 
Brahma Reddy Battula.

(cherry picked from commit 0113e4528deda7563b62a29745fbf209ab31b81a)


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

Branch: refs/heads/branch-2
Commit: eb9e06f8e30a6f930db478683739230f8f5ada5d
Parents: ddecd86
Author: Akira Ajisaka 
Authored: Wed Sep 9 17:20:46 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 9 17:21:22 2015 +0900

--
 .../org/apache/hadoop/hdfs/protocol/DatanodeInfo.java|  6 --
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../apache/hadoop/hdfs/server/namenode/TestMetaSave.java | 11 +++
 3 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb9e06f8/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
index 986cd5c..76a6757 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
@@ -369,9 +369,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 long c = getCapacity();
 long r = getRemaining();
 long u = getDfsUsed();
+float usedPercent = getDfsUsedPercent();
 long cc = getCacheCapacity();
 long cr = getCacheRemaining();
 long cu = getCacheUsed();
+float cacheUsedPercent = getCacheUsedPercent();
 buffer.append(getName());
 if (!NetworkTopology.DEFAULT_RACK.equals(location)) {
   buffer.append(" "+location);
@@ -385,11 +387,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 }
 buffer.append(" " + c + "(" + StringUtils.byteDesc(c)+")");
 buffer.append(" " + u + "(" + StringUtils.byteDesc(u)+")");
-buffer.append(" " + percent2String(u/(double)c));
+buffer.append(" " + percent2String(usedPercent));
 buffer.append(" " + r + "(" + StringUtils.byteDesc(r)+")");
 buffer.append(" " + cc + "(" + StringUtils.byteDesc(cc)+")");
 buffer.append(" " + cu + "(" + StringUtils.byteDesc(cu)+")");
-buffer.append(" " + percent2String(cu/(double)cc));
+buffer.append(" " + percent2String(cacheUsedPercent));
 buffer.append(" " + cr + "(" + StringUtils.byteDesc(cr)+")");
 buffer.append(" " + new Date(lastUpdate));
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb9e06f8/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 88a58e4..869950b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1011,6 +1011,9 @@ Release 2.7.2 - UNRELEASED
 HDFS-8995. Flaw in registration bookeeping can make DN die on reconnect.
 (Kihwal Lee via yliu)
 
+HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%.
+(Brahma Reddy Battula via aajisaka)
+
 Release 2.7.1 - 2015-07-06
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb9e06f8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
index 899cf41..786f83f 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -158,6 +159,16 @@ public class TestMetaSave {
   assertTrue(line.equals("Mis-replicated blocks that have been 
postponed:"));
   line = reader.readLine();
   assertTrue(line.equals("Metasave: B

hadoop git commit: HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by Brahma Reddy Battula.

2015-09-09 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 4b5767e45 -> c5a74c5c3


HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by 
Brahma Reddy Battula.

(cherry picked from commit 0113e4528deda7563b62a29745fbf209ab31b81a)
(cherry picked from commit eb9e06f8e30a6f930db478683739230f8f5ada5d)


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

Branch: refs/heads/branch-2.7
Commit: c5a74c5c37a1208b6b0077c723efc8f4c896711a
Parents: 4b5767e
Author: Akira Ajisaka 
Authored: Wed Sep 9 17:20:46 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 9 17:23:25 2015 +0900

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../org/apache/hadoop/hdfs/protocol/DatanodeInfo.java|  6 --
 .../apache/hadoop/hdfs/server/namenode/TestMetaSave.java | 11 +++
 3 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5a74c5c/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 06b87ec..e1785d2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -44,6 +44,9 @@ Release 2.7.2 - UNRELEASED
 HDFS-8384. Allow NN to startup if there are files having a lease but are 
not
 under construction. (jing9)
 
+HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%.
+(Brahma Reddy Battula via aajisaka)
+
 Release 2.7.1 - 2015-07-06
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5a74c5c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
index 1fd0018..a40143c 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
@@ -370,9 +370,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 long c = getCapacity();
 long r = getRemaining();
 long u = getDfsUsed();
+float usedPercent = getDfsUsedPercent();
 long cc = getCacheCapacity();
 long cr = getCacheRemaining();
 long cu = getCacheUsed();
+float cacheUsedPercent = getCacheUsedPercent();
 buffer.append(getName());
 if (!NetworkTopology.DEFAULT_RACK.equals(location)) {
   buffer.append(" "+location);
@@ -386,11 +388,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 }
 buffer.append(" " + c + "(" + StringUtils.byteDesc(c)+")");
 buffer.append(" " + u + "(" + StringUtils.byteDesc(u)+")");
-buffer.append(" " + percent2String(u/(double)c));
+buffer.append(" " + percent2String(usedPercent));
 buffer.append(" " + r + "(" + StringUtils.byteDesc(r)+")");
 buffer.append(" " + cc + "(" + StringUtils.byteDesc(cc)+")");
 buffer.append(" " + cu + "(" + StringUtils.byteDesc(cu)+")");
-buffer.append(" " + percent2String(cu/(double)cc));
+buffer.append(" " + percent2String(cacheUsedPercent));
 buffer.append(" " + cr + "(" + StringUtils.byteDesc(cr)+")");
 buffer.append(" " + new Date(lastUpdate));
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5a74c5c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
index 899cf41..786f83f 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -158,6 +159,16 @@ public class TestMetaSave {
   assertTrue(line.equals("Mis-replicated blocks that have been 
postponed:"));
   line = reader.readLine(

hadoop git commit: HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by Brahma Reddy Battula.

2015-09-09 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 94cf7ab9d -> 0113e4528


HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%. Contributed by 
Brahma Reddy Battula.


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

Branch: refs/heads/trunk
Commit: 0113e4528deda7563b62a29745fbf209ab31b81a
Parents: 94cf7ab
Author: Akira Ajisaka 
Authored: Wed Sep 9 17:20:46 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 9 17:20:46 2015 +0900

--
 .../org/apache/hadoop/hdfs/protocol/DatanodeInfo.java|  6 --
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../apache/hadoop/hdfs/server/namenode/TestMetaSave.java | 11 +++
 3 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
index 3555add..2ef40d2 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
@@ -371,9 +371,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 long c = getCapacity();
 long r = getRemaining();
 long u = getDfsUsed();
+float usedPercent = getDfsUsedPercent();
 long cc = getCacheCapacity();
 long cr = getCacheRemaining();
 long cu = getCacheUsed();
+float cacheUsedPercent = getCacheUsedPercent();
 buffer.append(getName());
 if (!NetworkTopology.DEFAULT_RACK.equals(location)) {
   buffer.append(" "+location);
@@ -387,11 +389,11 @@ public class DatanodeInfo extends DatanodeID implements 
Node {
 }
 buffer.append(" " + c + "(" + StringUtils.byteDesc(c)+")");
 buffer.append(" " + u + "(" + StringUtils.byteDesc(u)+")");
-buffer.append(" " + percent2String(u/(double)c));
+buffer.append(" " + percent2String(usedPercent));
 buffer.append(" " + r + "(" + StringUtils.byteDesc(r)+")");
 buffer.append(" " + cc + "(" + StringUtils.byteDesc(cc)+")");
 buffer.append(" " + cu + "(" + StringUtils.byteDesc(cu)+")");
-buffer.append(" " + percent2String(cu/(double)cc));
+buffer.append(" " + percent2String(cacheUsedPercent));
 buffer.append(" " + cr + "(" + StringUtils.byteDesc(cr)+")");
 buffer.append(" " + new Date(lastUpdate));
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/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 14666dd..a07fca2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1358,6 +1358,9 @@ Release 2.7.2 - UNRELEASED
 HDFS-8995. Flaw in registration bookeeping can make DN die on reconnect.
 (Kihwal Lee via yliu)
 
+HDFS-9033. dfsadmin -metasave prints "NaN" for cache used%.
+(Brahma Reddy Battula via aajisaka)
+
 Release 2.7.1 - 2015-07-06
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0113e452/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
index f1d3104..f818987 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -149,6 +150,16 @@ public class TestMetaSave {
   assertTrue(line.equals("Mis-replicated blocks that have been 
postponed:"));
   line = reader.readLine();
   assertTrue(line.equals("Metasave: Blocks being replicated: 0"));
+  line = reader.readLine();
+  assert