[21/50] [abbrv] hbase git commit: HBASE-2631 Decide between InMB and MB as suffix for field names in ClusterStatus objects

2017-08-20 Thread busbey 
HBASE-2631 Decide between InMB and MB as suffix for field names in 
ClusterStatus objects

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/HBASE-18467
Commit: d37266f63cf90068415a8cef05b1c63dccc0a9d9
Parents: d4317c8
Author: Deon Huang 
Authored: Sun Aug 13 21:52:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Tue Aug 15 21:42:31 2017 +0800

--
 .../org/apache/hadoop/hbase/ServerLoad.java | 27 
 .../tmpl/master/RegionServerListTmpl.jamon  |  4 +--
 .../org/apache/hadoop/hbase/TestServerLoad.java |  6 ++---
 3 files changed, 32 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
index 8547dfb..8d4c7d3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
@@ -131,18 +131,45 @@ public class ServerLoad {
 return storeUncompressedSizeMB;
   }
 
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileSizeInMB() {
 return storefileSizeMB;
   }
 
+  public int getStorefileSizeMB() {
+return storefileSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getMemstoreSizeMB()} instead.
+   */
+  @Deprecated
   public int getMemstoreSizeInMB() {
 return memstoreSizeMB;
   }
 
+  public int getMemstoreSizeMB() {
+return memstoreSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileIndexSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileIndexSizeInMB() {
 return storefileIndexSizeMB;
   }
 
+  public int getStorefileIndexSizeMB() {
+return storefileIndexSizeMB;
+  }
+
   public long getReadRequestsCount() {
 return readRequestsCount;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
--
diff --git 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index a62d5eb..5dd10e8 100644
--- 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -153,7 +153,7 @@ for (ServerName serverName: serverNames) {
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 
 
@@ -232,7 +232,7 @@ if (sl != null) {
 <% sl.getStorefiles() %>
 <% TraditionalBinaryPrefix.long2String(
   sl.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 
1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getTotalStaticIndexSizeKB()
   * TraditionalBinaryPrefix.KILO.value, "B", 1) %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
index cbd76ce..2d248b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
@@ -41,8 +41,8 @@ public class TestServerLoad {
 assertEquals(114, sl.getStorefiles());
 assertEquals(129, sl.getStoreUncompressedSizeMB());
 assertEquals(504, sl.getRootIndexSizeKB());
-assertEquals(820, sl.getStorefileSizeInMB());
-assertEqual

[30/50] [abbrv] hbase git commit: HBASE-2631 Decide between InMB and MB as suffix for field names in ClusterStatus objects

2017-08-17 Thread stack 
HBASE-2631 Decide between InMB and MB as suffix for field names in 
ClusterStatus objects

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/HBASE-14070.HLC
Commit: d37266f63cf90068415a8cef05b1c63dccc0a9d9
Parents: d4317c8
Author: Deon Huang 
Authored: Sun Aug 13 21:52:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Tue Aug 15 21:42:31 2017 +0800

--
 .../org/apache/hadoop/hbase/ServerLoad.java | 27 
 .../tmpl/master/RegionServerListTmpl.jamon  |  4 +--
 .../org/apache/hadoop/hbase/TestServerLoad.java |  6 ++---
 3 files changed, 32 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
index 8547dfb..8d4c7d3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
@@ -131,18 +131,45 @@ public class ServerLoad {
 return storeUncompressedSizeMB;
   }
 
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileSizeInMB() {
 return storefileSizeMB;
   }
 
+  public int getStorefileSizeMB() {
+return storefileSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getMemstoreSizeMB()} instead.
+   */
+  @Deprecated
   public int getMemstoreSizeInMB() {
 return memstoreSizeMB;
   }
 
+  public int getMemstoreSizeMB() {
+return memstoreSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileIndexSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileIndexSizeInMB() {
 return storefileIndexSizeMB;
   }
 
+  public int getStorefileIndexSizeMB() {
+return storefileIndexSizeMB;
+  }
+
   public long getReadRequestsCount() {
 return readRequestsCount;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
--
diff --git 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index a62d5eb..5dd10e8 100644
--- 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -153,7 +153,7 @@ for (ServerName serverName: serverNames) {
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 
 
@@ -232,7 +232,7 @@ if (sl != null) {
 <% sl.getStorefiles() %>
 <% TraditionalBinaryPrefix.long2String(
   sl.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 
1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getTotalStaticIndexSizeKB()
   * TraditionalBinaryPrefix.KILO.value, "B", 1) %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
index cbd76ce..2d248b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
@@ -41,8 +41,8 @@ public class TestServerLoad {
 assertEquals(114, sl.getStorefiles());
 assertEquals(129, sl.getStoreUncompressedSizeMB());
 assertEquals(504, sl.getRootIndexSizeKB());
-assertEquals(820, sl.getStorefileSizeInMB());
-assertE

hbase git commit: HBASE-2631 Decide between InMB and MB as suffix for field names in ClusterStatus objects

2017-08-15 Thread chia7712 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 8775f3027 -> 5073bd6e0


HBASE-2631 Decide between InMB and MB as suffix for field names in 
ClusterStatus objects

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/branch-2
Commit: 5073bd6e0472d2876bc5a72cb33678bebdddfb5c
Parents: 8775f30
Author: Deon Huang 
Authored: Sun Aug 13 21:52:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Tue Aug 15 21:43:43 2017 +0800

--
 .../org/apache/hadoop/hbase/ServerLoad.java | 27 
 .../tmpl/master/RegionServerListTmpl.jamon  |  4 +--
 .../org/apache/hadoop/hbase/TestServerLoad.java |  6 ++---
 3 files changed, 32 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5073bd6e/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
index 8547dfb..8d4c7d3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
@@ -131,18 +131,45 @@ public class ServerLoad {
 return storeUncompressedSizeMB;
   }
 
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileSizeInMB() {
 return storefileSizeMB;
   }
 
+  public int getStorefileSizeMB() {
+return storefileSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getMemstoreSizeMB()} instead.
+   */
+  @Deprecated
   public int getMemstoreSizeInMB() {
 return memstoreSizeMB;
   }
 
+  public int getMemstoreSizeMB() {
+return memstoreSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileIndexSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileIndexSizeInMB() {
 return storefileIndexSizeMB;
   }
 
+  public int getStorefileIndexSizeMB() {
+return storefileIndexSizeMB;
+  }
+
   public long getReadRequestsCount() {
 return readRequestsCount;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/5073bd6e/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
--
diff --git 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index a62d5eb..5dd10e8 100644
--- 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -153,7 +153,7 @@ for (ServerName serverName: serverNames) {
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 
 
@@ -232,7 +232,7 @@ if (sl != null) {
 <% sl.getStorefiles() %>
 <% TraditionalBinaryPrefix.long2String(
   sl.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 
1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getTotalStaticIndexSizeKB()
   * TraditionalBinaryPrefix.KILO.value, "B", 1) %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/5073bd6e/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
index cbd76ce..2d248b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
@@ -41,8 +41,8 @@ public class TestServerLoad {
 assertEquals(114, sl.getStorefiles());
 assertEquals(129, sl.getStoreUncompressedSizeMB());
 assertEquals(504, sl.getRootInd

hbase git commit: HBASE-2631 Decide between InMB and MB as suffix for field names in ClusterStatus objects

2017-08-15 Thread chia7712 
Repository: hbase
Updated Branches:
  refs/heads/master d4317c80e -> d37266f63


HBASE-2631 Decide between InMB and MB as suffix for field names in 
ClusterStatus objects

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/master
Commit: d37266f63cf90068415a8cef05b1c63dccc0a9d9
Parents: d4317c8
Author: Deon Huang 
Authored: Sun Aug 13 21:52:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Tue Aug 15 21:42:31 2017 +0800

--
 .../org/apache/hadoop/hbase/ServerLoad.java | 27 
 .../tmpl/master/RegionServerListTmpl.jamon  |  4 +--
 .../org/apache/hadoop/hbase/TestServerLoad.java |  6 ++---
 3 files changed, 32 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
index 8547dfb..8d4c7d3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
@@ -131,18 +131,45 @@ public class ServerLoad {
 return storeUncompressedSizeMB;
   }
 
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileSizeInMB() {
 return storefileSizeMB;
   }
 
+  public int getStorefileSizeMB() {
+return storefileSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getMemstoreSizeMB()} instead.
+   */
+  @Deprecated
   public int getMemstoreSizeInMB() {
 return memstoreSizeMB;
   }
 
+  public int getMemstoreSizeMB() {
+return memstoreSizeMB;
+  }
+
+  /**
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
+   * Use {@link #getStorefileIndexSizeMB()} instead.
+   */
+  @Deprecated
   public int getStorefileIndexSizeInMB() {
 return storefileIndexSizeMB;
   }
 
+  public int getStorefileIndexSizeMB() {
+return storefileIndexSizeMB;
+  }
+
   public long getReadRequestsCount() {
 return readRequestsCount;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
--
diff --git 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index a62d5eb..5dd10e8 100644
--- 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -153,7 +153,7 @@ for (ServerName serverName: serverNames) {
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 
 
@@ -232,7 +232,7 @@ if (sl != null) {
 <% sl.getStorefiles() %>
 <% TraditionalBinaryPrefix.long2String(
   sl.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 
1) %>
-<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeInMB()
+<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeMB()
   * TraditionalBinaryPrefix.MEGA.value, "B", 1) %>
 <% TraditionalBinaryPrefix.long2String(sl.getTotalStaticIndexSizeKB()
   * TraditionalBinaryPrefix.KILO.value, "B", 1) %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/d37266f6/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
index cbd76ce..2d248b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
@@ -41,8 +41,8 @@ public class TestServerLoad {
 assertEquals(114, sl.getStorefiles());
 assertEquals(129, sl.getStoreUncompressedSizeMB());
 assertEquals(504, sl.getRootIndexSi