Author: amitj
Date: Thu Jun 21 07:54:55 2018
New Revision: 1833980
URL: http://svn.apache.org/viewvc?rev=1833980&view=rev
Log:
OAK-7566: Rename metrics for DataStore garbage collection
- Renamed some metrics
- Removed a redundant counter FINISH_SUCCESS
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationStatsCollector.java
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationsStatsMBean.java
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java?rev=1833980&r1=1833979&r2=1833980&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
Thu Jun 21 07:54:55 2018
@@ -229,31 +229,27 @@ public class BlobGC extends AnnotatedSt
private CompositeData toCompositeData(OperationsStatsMBean statObj) throws
OpenDataException {
Object[] values = new Object[] {
statObj.getStartCount(),
- statObj.getFinishSucessCount(),
- statObj.getFinishErrorCount(),
+ statObj.getFailureCount(),
statObj.duration()
};
return new CompositeDataSupport(OP_STATS_TYPE, OP_STATS_FIELD_NAMES,
values);
}
private static final String[] OP_STATS_FIELD_NAMES = new String[] {
- "startCount",
- "finishSuccessCount",
- "finishErrorCount",
+ "count",
+ "failureCount",
"duration"
};
private static final String[] OP_STATS_FIELD_DESCRIPTIONS = new String[] {
- "Start Count",
- "Finish Success Count",
- "Finish Error Count",
+ "Count",
+ "Failure Count",
"Duration"
};
private static final OpenType[] OP_STATS_FIELD_TYPES = new OpenType[] {
SimpleType.LONG,
SimpleType.LONG,
- SimpleType.LONG,
SimpleType.LONG
};
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1833980&r1=1833979&r2=1833980&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
Thu Jun 21 07:54:55 2018
@@ -331,8 +331,6 @@ public class MarkSweepGarbageCollector i
LOG.info("Blob garbage collection completed in {} ({} ms).
Number of blobs deleted [{}] with max modification time of [{}]",
sw.toString(), sw.elapsed(TimeUnit.MILLISECONDS),
deleteCount, timestampToString(maxTime));
}
-
- statsCollector.finishSuccess();
} catch (Exception e) {
statsCollector.finishFailure();
LOG.error("Blob garbage collection error", e);
@@ -981,15 +979,14 @@ public class MarkSweepGarbageCollector i
}
class GarbageCollectionOperationStats implements OperationsStatsMBean {
- private static final String START = "START";
- private static final String FINISH_SUCCESS = "FINISH_SUCCESS";
- private static final String FINISH_FAILURE = "FINISH_FAILURE";
- private static final String DURATION = "DURATION";
- private static final String MARK_DURATION = "MARK_DURATION";
- private static final String SWEEP_DURATION = "SWEEP_DURATION";
+ private static final String NAME = "DataStoreGarbageCollection";
+ private static final String START = "COUNTER";
+ private static final String FINISH_FAILURE = "FAILURE";
+ private static final String DURATION = "ACTIVE_TIMER";
+ private static final String MARK_DURATION = "MARK_TIMER";
+ private static final String SWEEP_DURATION = "SWEEP_TIMER";
private CounterStats startCounter;
- private CounterStats finishSuccessCounter;
private CounterStats finishFailureCounter;
private TimerStats duration;
private final TimerStats markDuration;
@@ -998,7 +995,6 @@ public class MarkSweepGarbageCollector i
GarbageCollectionOperationStats(StatisticsProvider sp) {
this.startCounter = sp.getCounterStats(getMetricName(START),
StatsOptions.METRICS_ONLY);
- this.finishSuccessCounter =
sp.getCounterStats(getMetricName(FINISH_SUCCESS), StatsOptions.METRICS_ONLY);
this.finishFailureCounter =
sp.getCounterStats(getMetricName(FINISH_FAILURE), StatsOptions.METRICS_ONLY);
this.duration = sp.getTimer(getMetricName(DURATION),
StatsOptions.METRICS_ONLY);
this.markDuration = sp.getTimer(getMetricName(MARK_DURATION),
StatsOptions.METRICS_ONLY);
@@ -1011,11 +1007,6 @@ public class MarkSweepGarbageCollector i
}
@Override
- public void finishSuccess() {
- finishSuccessCounter.inc();
- }
-
- @Override
public void finishFailure() {
finishFailureCounter.inc();
}
@@ -1044,18 +1035,14 @@ public class MarkSweepGarbageCollector i
}
@Override public String getName() {
- return TYPE + "." +
GarbageCollectionOperationStats.class.getSimpleName();
+ return TYPE + "." + NAME;
}
@Override public long getStartCount() {
return startCounter.getCount();
}
- @Override public long getFinishSucessCount() {
- return finishSuccessCounter.getCount();
- }
-
- @Override public long getFinishErrorCount() {
+ @Override public long getFailureCount() {
return finishFailureCounter.getCount();
}
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationStatsCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationStatsCollector.java?rev=1833980&r1=1833979&r2=1833980&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationStatsCollector.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationStatsCollector.java
Thu Jun 21 07:54:55 2018
@@ -29,9 +29,6 @@ public interface OperationStatsCollector
@Override public void start() {
}
- @Override public void finishSuccess() {
- }
-
@Override public void finishFailure() {
}
@@ -51,11 +48,6 @@ public interface OperationStatsCollector
void start();
/**
- * Increment the finishSuccess counter
- */
- void finishSuccess();
-
- /**
* Increment the finishFailure counter
*/
void finishFailure();
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationsStatsMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationsStatsMBean.java?rev=1833980&r1=1833979&r2=1833980&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationsStatsMBean.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/OperationsStatsMBean.java
Thu Jun 21 07:54:55 2018
@@ -34,19 +34,13 @@ public interface OperationsStatsMBean {
*/
long getStartCount();
- /**
- * Returns the finish success count
- *
- * @return
- */
- long getFinishSucessCount();
/**
* Returns the finish error count
*
* @return
*/
- long getFinishErrorCount();
+ long getFailureCount();
/**
* Returns the duration of the operation
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java?rev=1833980&r1=1833979&r2=1833980&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java
Thu Jun 21 07:54:55 2018
@@ -210,8 +210,7 @@ public class BlobGCTest {
private void assertStats(OperationsStatsMBean operationStats) {
assertEquals("Start counter mismatch", 1,
operationStats.getStartCount());
- assertEquals("Finish success mismatch", 1,
operationStats.getFinishSucessCount());
- assertEquals("Finish error mismatch", 0,
operationStats.getFinishErrorCount());
+ assertEquals("Finish error mismatch", 0,
operationStats.getFailureCount());
}
private MarkSweepGarbageCollector initGC(long blobGcMaxAgeInSecs,
ThreadPoolExecutor executor)
