From 488d9350acd09e7aa57c06c4a507efe060f3d801 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. --- .../org/apache/hadoop/hbase/ClusterStatus.java | 4 +- .../java/org/apache/hadoop/hbase/ServerLoad.java | 2 +- .../hadoop/hbase/master/MetricsMasterSource.java | 2 +- .../hbase/master/MetricsMasterSourceImpl.java | 2 +- .../protobuf/generated/ClusterStatusProtos.java | 50 +++++++++++----------- .../src/main/protobuf/ClusterStatus.proto | 2 +- .../rest/model/StorageClusterStatusModel.java | 6 +-- .../generated/StorageClusterStatusMessage.java | 48 ++++++++++----------- .../protobuf/StorageClusterStatusMessage.proto | 2 +- .../apache/hadoop/hbase/master/MetricsMaster.java | 2 +- .../hadoop/hbase/regionserver/HRegionServer.java | 2 +- 11 files changed, 61 insertions(+), 61 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/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java index 5bc44ff..62746db 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java @@ -4369,9 +4369,9 @@ public final class ClusterStatusProtos { */ int getNumberOfRequests(); - // optional uint32 total_number_of_requests = 2; + // optional uint64 total_number_of_requests = 2; /** - * optional uint32 total_number_of_requests = 2; + * optional uint64 total_number_of_requests = 2; * *
      ** Total Number of requests from the start of the region server. 
@@ -4379,13 +4379,13 @@ public final class ClusterStatusProtos {
      */
     boolean hasTotalNumberOfRequests();
     /**
-     * optional uint32 total_number_of_requests = 2;
+     * optional uint64 total_number_of_requests = 2;
      *
      * 
      ** Total Number of requests from the start of the region server. 
      * 
*/ - int getTotalNumberOfRequests(); + long getTotalNumberOfRequests(); // optional uint32 used_heap_MB = 3; /** @@ -4654,7 +4654,7 @@ public final class ClusterStatusProtos { } case 16: { bitField0_ |= 0x00000002; - totalNumberOfRequests_ = input.readUInt32(); + totalNumberOfRequests_ = input.readUInt64(); break; } case 24: { @@ -4768,11 +4768,11 @@ public final class ClusterStatusProtos { return numberOfRequests_; } - // optional uint32 total_number_of_requests = 2; + // optional uint64 total_number_of_requests = 2; public static final int TOTAL_NUMBER_OF_REQUESTS_FIELD_NUMBER = 2; - private int totalNumberOfRequests_; + private long totalNumberOfRequests_; /** - * optional uint32 total_number_of_requests = 2; + * optional uint64 total_number_of_requests = 2; * *
      ** Total Number of requests from the start of the region server. 
@@ -4782,13 +4782,13 @@ public final class ClusterStatusProtos {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional uint32 total_number_of_requests = 2;
+     * optional uint64 total_number_of_requests = 2;
      *
      * 
      ** Total Number of requests from the start of the region server. 
      * 
*/ - public int getTotalNumberOfRequests() { + public long getTotalNumberOfRequests() { return totalNumberOfRequests_; } @@ -5055,7 +5055,7 @@ public final class ClusterStatusProtos { private void initFields() { numberOfRequests_ = 0; - totalNumberOfRequests_ = 0; + totalNumberOfRequests_ = 0L; usedHeapMB_ = 0; maxHeapMB_ = 0; regionLoads_ = java.util.Collections.emptyList(); @@ -5092,7 +5092,7 @@ public final class ClusterStatusProtos { output.writeUInt32(1, numberOfRequests_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeUInt32(2, totalNumberOfRequests_); + output.writeUInt64(2, totalNumberOfRequests_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeUInt32(3, usedHeapMB_); @@ -5130,7 +5130,7 @@ public final class ClusterStatusProtos { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, totalNumberOfRequests_); + .computeUInt64Size(2, totalNumberOfRequests_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream @@ -5241,7 +5241,7 @@ public final class ClusterStatusProtos { } if (hasTotalNumberOfRequests()) { hash = (37 * hash) + TOTAL_NUMBER_OF_REQUESTS_FIELD_NUMBER; - hash = (53 * hash) + getTotalNumberOfRequests(); + hash = (53 * hash) + hashLong(getTotalNumberOfRequests()); } if (hasUsedHeapMB()) { hash = (37 * hash) + USED_HEAP_MB_FIELD_NUMBER; @@ -5384,7 +5384,7 @@ public final class ClusterStatusProtos { super.clear(); numberOfRequests_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - totalNumberOfRequests_ = 0; + totalNumberOfRequests_ = 0L; bitField0_ = (bitField0_ & ~0x00000002); usedHeapMB_ = 0; bitField0_ = (bitField0_ & ~0x00000004); @@ -5659,10 +5659,10 @@ public final class ClusterStatusProtos { return this; } - // optional uint32 total_number_of_requests = 2; - private int totalNumberOfRequests_ ; + // optional uint64 total_number_of_requests = 2; + private long totalNumberOfRequests_ ; /** - * optional uint32 total_number_of_requests = 2; + * optional uint64 total_number_of_requests = 2; * *
        ** Total Number of requests from the start of the region server. 
@@ -5672,30 +5672,30 @@ public final class ClusterStatusProtos {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional uint32 total_number_of_requests = 2;
+       * optional uint64 total_number_of_requests = 2;
        *
        * 
        ** Total Number of requests from the start of the region server. 
        * 
*/ - public int getTotalNumberOfRequests() { + public long getTotalNumberOfRequests() { return totalNumberOfRequests_; } /** - * optional uint32 total_number_of_requests = 2; + * optional uint64 total_number_of_requests = 2; * *
        ** Total Number of requests from the start of the region server. 
        * 
*/ - public Builder setTotalNumberOfRequests(int value) { + public Builder setTotalNumberOfRequests(long value) { bitField0_ |= 0x00000002; totalNumberOfRequests_ = value; onChanged(); return this; } /** - * optional uint32 total_number_of_requests = 2; + * optional uint64 total_number_of_requests = 2; * *
        ** Total Number of requests from the start of the region server. 
@@ -5703,7 +5703,7 @@ public final class ClusterStatusProtos {
        */
       public Builder clearTotalNumberOfRequests() {
         bitField0_ = (bitField0_ & ~0x00000002);
-        totalNumberOfRequests_ = 0;
+        totalNumberOfRequests_ = 0L;
         onChanged();
         return this;
       }
@@ -10486,7 +10486,7 @@ public final class ClusterStatusProtos {
       "\n\024complete_sequence_id\030\017 \001(\004\022\025\n\rdata_loc" +
       "ality\030\020 \001(\002\"\212\002\n\nServerLoad\022\032\n\022number_of_" +
       "requests\030\001 \001(\r\022 \n\030total_number_of_reques" +
-      "ts\030\002 \001(\r\022\024\n\014used_heap_MB\030\003 \001(\r\022\023\n\013max_he" +
+      "ts\030\002 \001(\004\022\024\n\014used_heap_MB\030\003 \001(\r\022\023\n\013max_he" +
       "ap_MB\030\004 \001(\r\022!\n\014region_loads\030\005 \003(\0132\013.Regi" +
       "onLoad\022\"\n\014coprocessors\030\006 \003(\0132\014.Coprocess" +
       "or\022\031\n\021report_start_time\030\007 \001(\004\022\027\n\017report_",
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/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
index 05ff7a3..ffc5989 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
@@ -94,15 +94,15 @@ public final class StorageClusterStatusMessage {
      */
     int getRegions();
 
-    // optional int32 requests = 4;
+    // optional int64 requests = 4;
     /**
-     * optional int32 requests = 4;
+     * optional int64 requests = 4;
      */
     boolean hasRequests();
     /**
-     * optional int32 requests = 4;
+     * optional int64 requests = 4;
      */
-    int getRequests();
+    long getRequests();
 
     // optional double averageLoad = 5;
     /**
@@ -188,7 +188,7 @@ public final class StorageClusterStatusMessage {
             }
             case 32: {
               bitField0_ |= 0x00000002;
-              requests_ = input.readInt32();
+              requests_ = input.readInt64();
               break;
             }
             case 41: {
@@ -2956,19 +2956,19 @@ public final class StorageClusterStatusMessage {
       return regions_;
     }
 
-    // optional int32 requests = 4;
+    // optional int64 requests = 4;
     public static final int REQUESTS_FIELD_NUMBER = 4;
-    private int requests_;
+    private long requests_;
     /**
-     * optional int32 requests = 4;
+     * optional int64 requests = 4;
      */
     public boolean hasRequests() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional int32 requests = 4;
+     * optional int64 requests = 4;
      */
-    public int getRequests() {
+    public long getRequests() {
       return requests_;
     }
 
@@ -2992,7 +2992,7 @@ public final class StorageClusterStatusMessage {
       liveNodes_ = java.util.Collections.emptyList();
       deadNodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       regions_ = 0;
-      requests_ = 0;
+      requests_ = 0L;
       averageLoad_ = 0D;
     }
     private byte memoizedIsInitialized = -1;
@@ -3023,7 +3023,7 @@ public final class StorageClusterStatusMessage {
         output.writeInt32(3, regions_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeInt32(4, requests_);
+        output.writeInt64(4, requests_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeDouble(5, averageLoad_);
@@ -3056,7 +3056,7 @@ public final class StorageClusterStatusMessage {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, requests_);
+          .computeInt64Size(4, requests_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
@@ -3189,7 +3189,7 @@ public final class StorageClusterStatusMessage {
         bitField0_ = (bitField0_ & ~0x00000002);
         regions_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        requests_ = 0;
+        requests_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000008);
         averageLoad_ = 0D;
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -3796,35 +3796,35 @@ public final class StorageClusterStatusMessage {
         return this;
       }
 
-      // optional int32 requests = 4;
-      private int requests_ ;
+      // optional int64 requests = 4;
+      private long requests_ ;
       /**
-       * optional int32 requests = 4;
+       * optional int64 requests = 4;
        */
       public boolean hasRequests() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional int32 requests = 4;
+       * optional int64 requests = 4;
        */
-      public int getRequests() {
+      public long getRequests() {
         return requests_;
       }
       /**
-       * optional int32 requests = 4;
+       * optional int64 requests = 4;
        */
-      public Builder setRequests(int value) {
+      public Builder setRequests(long value) {
         bitField0_ |= 0x00000008;
         requests_ = value;
         onChanged();
         return this;
       }
       /**
-       * optional int32 requests = 4;
+       * optional int64 requests = 4;
        */
       public Builder clearRequests() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        requests_ = 0;
+        requests_ = 0L;
         onChanged();
         return this;
       }
@@ -3903,7 +3903,7 @@ public final class StorageClusterStatusMessage {
       "es\030\001 \003(\0132J.org.apache.hadoop.hbase.rest." +
       "protobuf.generated.StorageClusterStatus." +
       "Node\022\021\n\tdeadNodes\030\002 \003(\t\022\017\n\007regions\030\003 \001(\005" +
-      "\022\020\n\010requests\030\004 \001(\005\022\023\n\013averageLoad\030\005 \001(\001\032" +
+      "\022\020\n\010requests\030\004 \001(\003\022\023\n\013averageLoad\030\005 \001(\001\032" +
       "\322\002\n\006Region\022\014\n\004name\030\001 \002(\014\022\016\n\006stores\030\002 \001(\005" +
       "\022\022\n\nstorefiles\030\003 \001(\005\022\027\n\017storefileSizeMB\030" +
       "\004 \001(\005\022\026\n\016memstoreSizeMB\030\005 \001(\005\022\034\n\024storefi",
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)