This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new cabcb92 Revert "HBASE-25924 Re-compute size of WAL file while
removing from WALEntryStream (#3315)"
cabcb92 is described below
commit cabcb92d39659eb50ca566d9eef9f001286f959c
Author: Peter Somogyi <[email protected]>
AuthorDate: Thu Jun 10 19:23:55 2021 +0200
Revert "HBASE-25924 Re-compute size of WAL file while removing from
WALEntryStream (#3315)"
This reverts commit 1b09f313491fbbfe4229fe330712491f0ff80f3c.
---
.../regionserver/MetricsReplicationSourceSource.java | 1 -
.../MetricsReplicationGlobalSourceSourceImpl.java | 6 ------
.../MetricsReplicationSourceSourceImpl.java | 5 -----
.../hbase/regionserver/wal/ProtobufLogReader.java | 4 ----
.../hbase/replication/regionserver/MetricsSource.java | 9 ---------
.../replication/regionserver/TestWALEntryStream.java | 18 ------------------
6 files changed, 43 deletions(-)
diff --git
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
index 71ea2aa..35dd83f 100644
---
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
+++
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java
@@ -71,7 +71,6 @@ public interface MetricsReplicationSourceSource extends
BaseSource {
void decrSizeOfHFileRefsQueue(long size);
void incrUnknownFileLengthForClosedWAL();
void incrUncleanlyClosedWALs();
- long getUncleanlyClosedWALs();
void incrBytesSkippedInUncleanlyClosedWALs(final long bytes);
void incrRestartedWALReading();
void incrRepeatedFileBytes(final long bytes);
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSourceImpl.java
index dd3f4a9..c06900b 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSourceImpl.java
@@ -191,12 +191,6 @@ public class MetricsReplicationGlobalSourceSourceImpl
public void incrUncleanlyClosedWALs() {
uncleanlyClosedWAL.incr(1L);
}
-
- @Override
- public long getUncleanlyClosedWALs() {
- return uncleanlyClosedWAL.value();
- }
-
@Override
public void incrBytesSkippedInUncleanlyClosedWALs(final long bytes) {
uncleanlyClosedSkippedBytes.incr(bytes);
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
index 275ccbb..851657c 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
@@ -238,11 +238,6 @@ public class MetricsReplicationSourceSourceImpl implements
MetricsReplicationSou
}
@Override
- public long getUncleanlyClosedWALs() {
- return uncleanlyClosedWAL.value();
- }
-
- @Override
public void incrBytesSkippedInUncleanlyClosedWALs(final long bytes) {
uncleanlyClosedSkippedBytes.incr(bytes);
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
index b073bd3..aaa94e7 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
@@ -205,10 +205,6 @@ public class ProtobufLogReader extends ReaderBase {
private String initInternal(FSDataInputStream stream, boolean isFirst)
throws IOException {
close();
- if (!isFirst) {
- // Re-compute the file length.
- this.fileLength = fs.getFileStatus(path).getLen();
- }
long expectedPos = PB_WAL_MAGIC.length;
if (stream == null) {
stream = fs.open(path);
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
index 0e916a9..32a8b11 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
@@ -298,15 +298,6 @@ public class MetricsSource implements BaseSource {
return getTimestampOfLastShippedOp();
}
-
- /**
- * Get the value of uncleanlyClosedWAL counter
- * @return uncleanlyClosedWAL
- */
- public long getUncleanlyClosedWALs() {
- return singleSourceSource.getUncleanlyClosedWALs();
- }
-
/**
* Get the timestampsOfLastShippedOp, if there are multiple groups, return
the latest one
* @return lastTimestampForAge
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java
index 1adcbda..87ae41a 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java
@@ -749,22 +749,4 @@ public class TestWALEntryStream {
// remove empty log from logQueue.
assertEquals(0, queue.size());
}
-
- /**
- * Tests that wals are closed cleanly and we read the trailer when we remove
wal
- * from WALEntryStream.
- */
- @Test
- public void testCleanClosedWALs() throws Exception {
- try (WALEntryStream entryStream = new WALEntryStream(
- logQueue, CONF, 0, log, null, logQueue.getMetrics(), fakeWalGroupId)) {
- assertEquals(0, logQueue.getMetrics().getUncleanlyClosedWALs());
- appendToLogAndSync();
- assertNotNull(entryStream.next());
- log.rollWriter();
- appendToLogAndSync();
- assertNotNull(entryStream.next());
- assertEquals(0, logQueue.getMetrics().getUncleanlyClosedWALs());
- }
- }
}
