svn commit: r1594468 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver: MetricsSource.java ReplicationSource.java

[la...@apache.org]

Author: larsh
Date: Wed May 14 06:15:01 2014
New Revision: 1594468

URL: http://svn.apache.org/r1594468
Log:
HBASE-11143 Improve replication metrics.

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java?rev=1594468&r1=1594467&r2=1594468&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java Wed May 14 06:15:01 2014
@@ -36,6 +36,7 @@ public class MetricsSource {
   public static final String SOURCE_LOG_EDITS_READ = "source.logEditsRead";
   public static final String SOURCE_LOG_EDITS_FILTERED = "source.logEditsFiltered";
   public static final String SOURCE_SHIPPED_BATCHES = "source.shippedBatches";
+  public static final String SOURCE_SHIPPED_KBS = "source.shippedKBs";
   public static final String SOURCE_SHIPPED_OPS = "source.shippedOps";
   public static final String SOURCE_LOG_READ_IN_BYTES = "source.logReadInBytes";
 
@@ -51,6 +52,7 @@ public class MetricsSource {
   private String logEditsFilteredKey;
   private final String shippedBatchesKey;
   private final String shippedOpsKey;
+  private final String shippedKBsKey;
   private final String logReadInBytesKey;
 
   private MetricsReplicationSource rms;
@@ -69,6 +71,7 @@ public class MetricsSource {
     logEditsFilteredKey = "source." + id + ".logEditsFiltered";
     shippedBatchesKey = "source." + this.id + ".shippedBatches";
     shippedOpsKey = "source." + this.id + ".shippedOps";
+    shippedKBsKey = "source." + this.id + ".shippedKBs";
     logReadInBytesKey = "source." + this.id + ".logReadInBytes";
     rms = CompatibilitySingletonFactory.getInstance(MetricsReplicationSource.class);
   }
@@ -141,11 +144,13 @@ public class MetricsSource {
    *
    * @param batchSize the size of the batch that was shipped to sinks.
    */
-  public void shipBatch(long batchSize) {
+  public void shipBatch(long batchSize, int sizeInKB) {
     rms.incCounters(shippedBatchesKey, 1);
     rms.incCounters(SOURCE_SHIPPED_BATCHES, 1);
     rms.incCounters(shippedOpsKey, batchSize);
     rms.incCounters(SOURCE_SHIPPED_OPS, batchSize);
+    rms.incCounters(shippedKBsKey, sizeInKB);
+    rms.incCounters(SOURCE_SHIPPED_KBS, sizeInKB);
   }
   
   /** increase the byte number read by source from log file */

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java?rev=1594468&r1=1594467&r2=1594468&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java Wed May 14 06:15:01 2014
@@ -738,7 +738,7 @@ public class ReplicationSource extends T
         }
         this.totalReplicatedEdits += entries.size();
         this.totalReplicatedOperations += currentNbOperations;
-        this.metrics.shipBatch(this.currentNbOperations);
+        this.metrics.shipBatch(this.currentNbOperations, this.currentSize/1024);
         this.metrics.setAgeOfLastShippedOp(entries.get(entries.size()-1).getKey().getWriteTime());
         if (LOG.isTraceEnabled()) {
           LOG.trace("Replicated " + this.totalReplicatedEdits + " entries in total, or "