Skip to content

HBASE-22246 Removed deprecated field from MetricsReplicationSourceSource #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2019
Merged

HBASE-22246 Removed deprecated field from MetricsReplicationSourceSource #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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_OPS = "source.shippedOps";

Expand Down
25 changes: 0 additions & 25 deletions ...rg/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ public class MetricsReplicationGlobalSourceSource implements MetricsReplicationS
private final MutableFastCounter shippedBatchesCounter;
private final MutableFastCounter shippedOpsCounter;
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 shippedHFilesCounter;
private final MutableGaugeLong sizeOfHFileRefsQueueGauge;
Expand All @@ -65,8 +59,6 @@ public MetricsReplicationGlobalSourceSource(MetricsReplicationSourceImpl rms) {

shippedOpsCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_OPS, 0L);

shippedKBsCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_KBS, 0L);

shippedBytesCounter = rms.getMetricsRegistry().getCounter(SOURCE_SHIPPED_BYTES, 0L);

logReadInBytesCounter = rms.getMetricsRegistry().getCounter(SOURCE_LOG_READ_IN_BYTES, 0L);
Expand Down Expand Up @@ -124,23 +116,6 @@ public MetricsReplicationGlobalSourceSource(MetricsReplicationSourceImpl rms) {

@Override public void incrShippedBytes(long 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) {
Expand Down
12 changes: 0 additions & 12 deletions .../org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
private final String shippedOpsKey;
private String keyPrefix;

/**
* @deprecated since 1.3.0. Use {@link #shippedBytesKey} instead.
*/
@Deprecated
private final String shippedKBsKey;
private final String shippedBytesKey;
private final String logReadInBytesKey;
private final String shippedHFilesKey;
Expand All @@ -51,7 +46,6 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
private final MutableFastCounter walEditsFilteredCounter;
private final MutableFastCounter shippedBatchesCounter;
private final MutableFastCounter shippedOpsCounter;
private final MutableFastCounter shippedKBsCounter;
private final MutableFastCounter shippedBytesCounter;
private final MutableFastCounter logReadInBytesCounter;
private final MutableFastCounter shippedHFilesCounter;
Expand Down Expand Up @@ -89,9 +83,6 @@ public MetricsReplicationSourceSourceImpl(MetricsReplicationSourceImpl rms, Stri
shippedOpsKey = this.keyPrefix + "shippedOps";
shippedOpsCounter = rms.getMetricsRegistry().getCounter(shippedOpsKey, 0L);

shippedKBsKey = this.keyPrefix + "shippedKBs";
shippedKBsCounter = rms.getMetricsRegistry().getCounter(shippedKBsKey, 0L);

shippedBytesKey = this.keyPrefix + "shippedBytes";
shippedBytesCounter = rms.getMetricsRegistry().getCounter(shippedBytesKey, 0L);

Expand Down Expand Up @@ -162,8 +153,6 @@ public MetricsReplicationSourceSourceImpl(MetricsReplicationSourceImpl rms, Stri

@Override public void incrShippedBytes(long size) {
shippedBytesCounter.incr(size);
MetricsReplicationGlobalSourceSource
.incrementKBsCounter(shippedBytesCounter, shippedKBsCounter);
}

@Override public void incrLogReadInBytes(long size) {
Expand All @@ -177,7 +166,6 @@ public MetricsReplicationSourceSourceImpl(MetricsReplicationSourceImpl rms, Stri

rms.removeMetric(shippedBatchesKey);
rms.removeMetric(shippedOpsKey);
rms.removeMetric(shippedKBsKey);
rms.removeMetric(shippedBytesKey);

rms.removeMetric(logReadInBytesKey);
Expand Down