Implementing IOStatisticsSource in DelegationTokenSecretStorageMetrics

Author: hchaverri

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java

@@ -36,6 +36,9 @@
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.fs.statistics.IOStatistics;
+import org.apache.hadoop.fs.statistics.IOStatisticsSource;
+import org.apache.hadoop.fs.statistics.impl.IOStatisticsStore;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.metrics2.annotation.Metric;
 import org.apache.hadoop.metrics2.annotation.Metrics;
@@ -55,6 +58,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.hadoop.fs.statistics.impl.IOStatisticsBinding.*;
+
+
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
 public abstract 
@@ -854,14 +860,19 @@ protected void syncTokenOwnerStats() {
       addTokenForOwnerStats(id);
     }
   }
-  
+
   /**
    * DelegationTokenSecretManagerMetrics tracks token management operations
    * and publishes them through the metrics interfaces.
    */
   @Metrics(about="Delegation token secret manager metrics", context="token")
-  static class DelegationTokenSecretManagerMetrics {
+  static class DelegationTokenSecretManagerMetrics implements IOStatisticsSource {
+    final static String STORE_TOKEN_STAT = "storeToken";
+    final static String UPDATE_TOKEN_STAT = "updateToken";
+    final static String REMOVE_TOKEN_STAT = "removeToken";
+
     final MetricsRegistry registry = new MetricsRegistry("DelegationTokenSecretManagerMetrics");
+    final IOStatisticsStore ioStatistics;
 
     @Metric("Rate of storage of delegation tokens and latency (milliseconds)")
     MutableRate storeToken;
@@ -873,5 +884,31 @@ static class DelegationTokenSecretManagerMetrics {
     static DelegationTokenSecretManagerMetrics create() {
       return DefaultMetricsSystem.instance().register(new DelegationTokenSecretManagerMetrics());
     }
+
+    public DelegationTokenSecretManagerMetrics() {
+      ioStatistics = iostatisticsStore()
+          .withDurationTracking(STORE_TOKEN_STAT, UPDATE_TOKEN_STAT, REMOVE_TOKEN_STAT)
+          .build();
+    }
+
+    public void addStoreToken(long value) {
+      storeToken.add(value);
+      ioStatistics.addTimedOperation(STORE_TOKEN_STAT, value);
+    }
+
+    public void addUpdateToken(long value) {
+      updateToken.add(value);
+      ioStatistics.addTimedOperation(UPDATE_TOKEN_STAT, value);
+    }
+
+    public void addRemoveToken(long value) {
+      removeToken.add(value);
+      ioStatistics.addTimedOperation(REMOVE_TOKEN_STAT, value);
+    }
+
+    @Override
+    public IOStatistics getIOStatistics() {
+      return ioStatistics;
+    }
   }
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java

@@ -587,7 +587,7 @@ public void testDelegationTokenSecretManagerMetrics() throws Exception {
             10*1000,1*1000,3600000);
     try {
       dtSecretManager.startThreads();
-      
+
       Assert.assertEquals(0, dtSecretManager.metrics.storeToken.lastStat().numSamples());
       final Token<TestDelegationTokenIdentifier> token =
           generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker");