From ea69bcf6fb646a29d4e72f62dbccf36bda672412 Mon Sep 17 00:00:00 2001
From: Andrew Purtell <apurtell@apache.org>
Date: Thu, 14 May 2020 13:41:56 -0700
Subject: [PATCH] Amend HBASE-24350: Extending and Fixing HBaseTable level
 replication metrics (#1704)

- Rename WALEntryBatch#getWaEntriesWithSize -> getWalEntriesWithSize

(cherry picked from commit a93d94cad312d7c92b3a2eb43848058605d27dcb)
---
 .../replication/regionserver/ReplicationSourceShipper.java      | 2 +-
 .../hadoop/hbase/replication/regionserver/WALEntryBatch.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
index fcd8babb3e50..78e5521f7268 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
@@ -215,7 +215,7 @@ private void shipEdits(WALEntryBatch entryBatch) {
           entryBatch.getNbHFiles());
         source.getSourceMetrics().setAgeOfLastShippedOp(
           entries.get(entries.size() - 1).getKey().getWriteTime(), walGroupId);
-        source.getSourceMetrics().updateTableLevelMetrics(entryBatch.getWaEntriesWithSize());
+        source.getSourceMetrics().updateTableLevelMetrics(entryBatch.getWalEntriesWithSize());
 
         if (LOG.isTraceEnabled()) {
           LOG.trace("Replicated {} entries or {} operations in {} ms",
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.java
index bc600d088803..4f96c96d3c5d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.java
@@ -83,7 +83,7 @@ public List<Entry> getWalEntries() {
   /**
    * @return the WAL Entries.
    */
-  public List<Pair<Entry, Long>> getWaEntriesWithSize() {
+  public List<Pair<Entry, Long>> getWalEntriesWithSize() {
     return walEntriesWithSize;
   }