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

HBASE-25679 Size of log queue metric is incorrect (#3071) 

Co-authored-by: Rushabh <rushabh.shah@salesforce.com>
Signed-off-by: stack <stack@apache.org>
This commit is contained in:
shahrs87 2021-03-19 16:14:45 -07:00 committed by stack
parent f4059907e2
commit fea4bd12e2
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceLogQueue.java
View File

@ -186,4 +186,8 @@ public class ReplicationSourceLogQueue {
}
return oldestWalTimestamp;
}
public MetricsSource getMetrics() {
return metrics;
}
}

30
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java
View File

@ -135,7 +135,10 @@ public class TestWALEntryStream {
@Before
public void setUp() throws Exception {
ReplicationSource source = mock(ReplicationSource.class);
logQueue = new ReplicationSourceLogQueue(CONF, new MetricsSource("2"), source);
MetricsSource metricsSource = new MetricsSource("2");
// Source with the same id is shared and carries values from the last run
metricsSource.clear();
logQueue = new ReplicationSourceLogQueue(CONF, metricsSource, source);
pathWatcher = new PathWatcher();
final WALFactory wals = new WALFactory(CONF, tn.getMethodName());
wals.getWALProvider().addWALActionsListener(pathWatcher);
@ -766,4 +769,29 @@ public class TestWALEntryStream {
}
writer.close();
}
/**
* Tests size of log queue is incremented and decremented properly.
*/
@Test
public void testSizeOfLogQueue() throws Exception {
// There should be always 1 log which is current wal.
assertEquals(1, logQueue.getMetrics().getSizeOfLogQueue());
appendToLogAndSync();
log.rollWriter();
// After rolling there will be 2 wals in the queue
assertEquals(2, logQueue.getMetrics().getSizeOfLogQueue());
try (WALEntryStream entryStream = new WALEntryStream(
logQueue, CONF, 0, log, null, logQueue.getMetrics(), fakeWalGroupId)) {
// There's one edit in the log, read it.
assertTrue(entryStream.hasNext());
WAL.Entry entry = entryStream.next();
assertNotNull(entry);
assertFalse(entryStream.hasNext());
}
// After removing one wal, size of log queue will be 1 again.
assertEquals(1, logQueue.getMetrics().getSizeOfLogQueue());
}
}