Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22246 Removed deprecated field from MetricsReplicationSourceSource

This commit is contained in:
Sayed Anisul Hoque 2019-04-16 15:38:58 +02:00 committed by Jan Hentschel
parent 409523b110
commit d5a6433937
3 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
View File

@ -28,11 +28,6 @@ public interface MetricsReplicationSourceSource extends BaseSource {
public static final String SOURCE_AGE_OF_LAST_SHIPPED_OP = "source.ageOfLastShippedOp"; public static final String SOURCE_AGE_OF_LAST_SHIPPED_OP = "source.ageOfLastShippedOp";
public static final String SOURCE_SHIPPED_BATCHES = "source.shippedBatches"; public static final String SOURCE_SHIPPED_BATCHES = "source.shippedBatches";
/**
* @deprecated Use {@link #SOURCE_SHIPPED_BYTES} instead
*/
@Deprecated
public static final String SOURCE_SHIPPED_KBS = "source.shippedKBs";
public static final String SOURCE_SHIPPED_BYTES = "source.shippedBytes"; public static final String SOURCE_SHIPPED_BYTES = "source.shippedBytes";
public static final String SOURCE_SHIPPED_OPS = "source.shippedOps"; public static final String SOURCE_SHIPPED_OPS = "source.shippedOps";

25
hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
View File

@ -36,12 +36,6 @@ public class MetricsReplicationGlobalSourceSource implements MetricsReplicationS
private final MutableFastCounter shippedBatchesCounter; private final MutableFastCounter shippedBatchesCounter;
private final MutableFastCounter shippedOpsCounter; private final MutableFastCounter shippedOpsCounter;
private final MutableFastCounter shippedBytesCounter; private final MutableFastCounter shippedBytesCounter;
/**
* @deprecated since 1.3.0. Use {@link #shippedBytesCounter} instead.
*/
@Deprecated
private final MutableFastCounter shippedKBsCounter;
private final MutableFastCounter logReadInBytesCounter; private final MutableFastCounter logReadInBytesCounter;
private final MutableFastCounter shippedHFilesCounter; private final MutableFastCounter shippedHFilesCounter;
private final MutableGaugeLong sizeOfHFileRefsQueueGauge; private final MutableGaugeLong sizeOfHFileRefsQueueGauge;
@ -65,8 +59,6 @@ public class MetricsReplicationGlobalSourceSource implements MetricsReplicationS
shippedOpsCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_OPS, 0L); shippedOpsCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_OPS, 0L);
shippedKBsCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_KBS, 0L);
shippedBytesCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_BYTES, 0L); shippedBytesCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_BYTES, 0L);
logReadInBytesCounter = rms.getMetricsRegistry().getCounter(SOURCE_LOG_READ_IN_BYTES, 0L); logReadInBytesCounter = rms.getMetricsRegistry().getCounter(SOURCE_LOG_READ_IN_BYTES, 0L);
@ -124,23 +116,6 @@ public class MetricsReplicationGlobalSourceSource implements MetricsReplicationS
@Override public void incrShippedBytes(long size) { @Override public void incrShippedBytes(long size) {
shippedBytesCounter.incr(size); shippedBytesCounter.incr(size);
// obtained value maybe smaller than 1024. We should make sure that KB count
// eventually picks up even from multiple smaller updates.
incrementKBsCounter(shippedBytesCounter, shippedKBsCounter);
}
static void incrementKBsCounter(MutableFastCounter bytesCounter, MutableFastCounter kbsCounter) {
// Following code should be thread-safe.
long delta = 0;
while(true) {
long bytes = bytesCounter.value();
delta = (bytes / 1024) - kbsCounter.value();
if (delta > 0) {
kbsCounter.incr(delta);
} else {
break;
}
}
} }
@Override public void incrLogReadInBytes(long size) { @Override public void incrLogReadInBytes(long size) {

12
hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
View File

@ -35,11 +35,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
private final String shippedOpsKey; private final String shippedOpsKey;
private String keyPrefix; private String keyPrefix;
/**
* @deprecated since 1.3.0. Use {@link #shippedBytesKey} instead.
*/
@Deprecated
private final String shippedKBsKey;
private final String shippedBytesKey; private final String shippedBytesKey;
private final String logReadInBytesKey; private final String logReadInBytesKey;
private final String shippedHFilesKey; private final String shippedHFilesKey;
@ -51,7 +46,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
private final MutableFastCounter walEditsFilteredCounter; private final MutableFastCounter walEditsFilteredCounter;
private final MutableFastCounter shippedBatchesCounter; private final MutableFastCounter shippedBatchesCounter;
private final MutableFastCounter shippedOpsCounter; private final MutableFastCounter shippedOpsCounter;
private final MutableFastCounter shippedKBsCounter;
private final MutableFastCounter shippedBytesCounter; private final MutableFastCounter shippedBytesCounter;
private final MutableFastCounter logReadInBytesCounter; private final MutableFastCounter logReadInBytesCounter;
private final MutableFastCounter shippedHFilesCounter; private final MutableFastCounter shippedHFilesCounter;
@ -89,9 +83,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
shippedOpsKey = this.keyPrefix + "shippedOps"; shippedOpsKey = this.keyPrefix + "shippedOps";
shippedOpsCounter = rms.getMetricsRegistry().getCounter(shippedOpsKey, 0L); shippedOpsCounter = rms.getMetricsRegistry().getCounter(shippedOpsKey, 0L);
shippedKBsKey = this.keyPrefix + "shippedKBs";
shippedKBsCounter = rms.getMetricsRegistry().getCounter(shippedKBsKey, 0L);
shippedBytesKey = this.keyPrefix + "shippedBytes"; shippedBytesKey = this.keyPrefix + "shippedBytes";
shippedBytesCounter = rms.getMetricsRegistry().getCounter(shippedBytesKey, 0L); shippedBytesCounter = rms.getMetricsRegistry().getCounter(shippedBytesKey, 0L);
@ -162,8 +153,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
@Override public void incrShippedBytes(long size) { @Override public void incrShippedBytes(long size) {
shippedBytesCounter.incr(size); shippedBytesCounter.incr(size);
MetricsReplicationGlobalSourceSource
.incrementKBsCounter(shippedBytesCounter, shippedKBsCounter);
} }
@Override public void incrLogReadInBytes(long size) { @Override public void incrLogReadInBytes(long size) {
@ -177,7 +166,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
rms.removeMetric(shippedBatchesKey); rms.removeMetric(shippedBatchesKey);
rms.removeMetric(shippedOpsKey); rms.removeMetric(shippedOpsKey);
rms.removeMetric(shippedKBsKey);
rms.removeMetric(shippedBytesKey); rms.removeMetric(shippedBytesKey);
rms.removeMetric(logReadInBytesKey); rms.removeMetric(logReadInBytesKey);