From 79ee27de4f18ab1a9c8d10ae4f4bc647cf9ca659 Mon Sep 17 00:00:00 2001 From: zhaoyunjiong Date: Mon, 10 Nov 2014 14:07:55 +0800 Subject: [PATCH] HBASE-12444. Total number of requests should be uint64. --- .../src/main/java/org/apache/hadoop/hbase/ClusterStatus.java | 4 ++-- hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java | 2 +- .../java/org/apache/hadoop/hbase/master/MetricsMasterSource.java | 2 +- .../org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java | 2 +- hbase-protocol/src/main/protobuf/ClusterStatus.proto | 2 +- .../apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java | 6 +++--- .../hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto | 2 +- .../src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index 50eda7a..9f6e17a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -157,8 +157,8 @@ public class ClusterStatus extends VersionedWritable { /** * @return the number of requests since last report */ - public int getRequestsCount() { - int count = 0; + public long getRequestsCount() { + long count = 0; for (Map.Entry e: this.liveServers.entrySet()) { count += e.getValue().getTotalNumberOfRequests(); } 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 18e5d67..a6c319e 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 @@ -91,7 +91,7 @@ public class ServerLoad { } /* @return total Number of requests from the start of the region server. */ - public int getTotalNumberOfRequests() { + public long getTotalNumberOfRequests() { return serverLoad.getTotalNumberOfRequests(); } public boolean hasTotalNumberOfRequests() { diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java index 8d54190..4692c59 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java @@ -79,7 +79,7 @@ public interface MetricsMasterSource extends BaseSource { * * @param inc Ammount to increment the total by. */ - void incRequests(final int inc); + void incRequests(final long inc); diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java index d4c90dc..a965ed3 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java @@ -61,7 +61,7 @@ public class MetricsMasterSourceImpl clusterRequestsCounter = metricsRegistry.newCounter(CLUSTER_REQUESTS_NAME, "", 0l); } - public void incRequests(final int inc) { + public void incRequests(final long inc) { this.clusterRequestsCounter.incr(inc); } diff --git a/hbase-protocol/src/main/protobuf/ClusterStatus.proto b/hbase-protocol/src/main/protobuf/ClusterStatus.proto index 7e78395..853ccda 100644 --- a/hbase-protocol/src/main/protobuf/ClusterStatus.proto +++ b/hbase-protocol/src/main/protobuf/ClusterStatus.proto @@ -122,7 +122,7 @@ message ServerLoad { optional uint32 number_of_requests = 1; /** Total Number of requests from the start of the region server. */ - optional uint32 total_number_of_requests = 2; + optional uint64 total_number_of_requests = 2; /** the amount of used heap, in MB. */ optional uint32 used_heap_MB = 3; diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java index 3b044e7..e291d6c 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java @@ -505,7 +505,7 @@ public class StorageClusterStatusModel private List liveNodes = new ArrayList(); private List deadNodes = new ArrayList(); private int regions; - private int requests; + private long requests; private double averageLoad; /** @@ -584,7 +584,7 @@ public class StorageClusterStatusModel * the last reporting interval */ @XmlAttribute - public int getRequests() { + public long getRequests() { return requests; } @@ -621,7 +621,7 @@ public class StorageClusterStatusModel * @param requests the total number of requests per second handled by the * cluster */ - public void setRequests(int requests) { + public void setRequests(long requests) { this.requests = requests; } diff --git a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto index a0291b4..2d6a81a 100644 --- a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto +++ b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto @@ -46,6 +46,6 @@ message StorageClusterStatus { repeated string deadNodes = 2; // summary statistics optional int32 regions = 3; - optional int32 requests = 4; + optional int64 requests = 4; optional double averageLoad = 5; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java index 9731b4e..af3ab73 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java @@ -52,7 +52,7 @@ public class MetricsMaster { /** * @param inc How much to add to requests. */ - public void incrementRequests(final int inc) { + public void incrementRequests(final long inc) { masterSource.incRequests(inc); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 45e5558..22122fb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1091,7 +1091,7 @@ public class HRegionServer extends HasThread implements ClusterStatusProtos.ServerLoad.Builder serverLoad = ClusterStatusProtos.ServerLoad.newBuilder(); serverLoad.setNumberOfRequests((int) regionServerWrapper.getRequestsPerSecond()); - serverLoad.setTotalNumberOfRequests((int) regionServerWrapper.getTotalRequestCount()); + serverLoad.setTotalNumberOfRequests(regionServerWrapper.getTotalRequestCount()); serverLoad.setUsedHeapMB((int)(memory.getUsed() / 1024 / 1024)); serverLoad.setMaxHeapMB((int) (memory.getMax() / 1024 / 1024)); Set coprocessors = this.hlog.getCoprocessorHost().getCoprocessors(); -- 1.8.5.2 (Apple Git-48)