From 84e3dee68197ad5dd0a98a1b6078c6870300d14a Mon Sep 17 00:00:00 2001
From: binlijin <binlijin@gmail.com>
Date: Wed, 20 Oct 2021 20:15:29 +0800
Subject: [PATCH] HBASE-26385 Clear CellScanner when replay

---
 .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index b13ff64d5b2d..a599d160eccb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -2089,6 +2089,7 @@ public ReplicateWALEntryResponse replay(final RpcController controller,
       final ReplicateWALEntryRequest request) throws ServiceException {
     long before = EnvironmentEdgeManager.currentTime();
     CellScanner cells = ((HBaseRpcController) controller).cellScanner();
+    ((HBaseRpcController) controller).setCellScanner(null);
     try {
       checkOpen();
       List<WALEntry> entries = request.getEntryList();
@@ -2209,6 +2210,7 @@ public ReplicateWALEntryResponse replicateWALEntry(final RpcController controlle
         List<WALEntry> entries = request.getEntryList();
         checkShouldRejectReplicationRequest(entries);
         CellScanner cellScanner = ((HBaseRpcController) controller).cellScanner();
+        ((HBaseRpcController) controller).setCellScanner(null);
         server.getRegionServerCoprocessorHost().preReplicateLogEntries();
         server.getReplicationSinkService().replicateLogEntries(entries, cellScanner,
           request.getReplicationClusterId(), request.getSourceBaseNamespaceDirPath(),