(hbase) branch master updated: HBASE-28743 Fixes NPE for TableSnapshotScanner by disabling mslab (#6101)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 743e8d6a6a1 HBASE-28743 Fixes NPE for TableSnapshotScanner by disabling mslab (#6101)
743e8d6a6a1 is described below

commit 743e8d6a6a1aa16754c1a6691900f5d231b5f8b2
Author: Vineet Kumar Maheshwari <vi...@users.noreply.github.com>
AuthorDate: Mon Jul 22 18:44:52 2024 +0530

    HBASE-28743 Fixes NPE for TableSnapshotScanner by disabling mslab (#6101)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Pankaj Kumar <pa...@apache.org>
---
 .../main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
index 72242c47558..c2bc0f08d10 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.PrivateCellUtil;
+import org.apache.hadoop.hbase.regionserver.MemStoreLAB;
 import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper;
 import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;
 import org.apache.hadoop.hbase.snapshot.SnapshotManifest;
@@ -122,6 +123,7 @@ public class TableSnapshotScanner extends AbstractClientScanner {
     this.scan = scan;
     this.snapshotAlreadyRestored = snapshotAlreadyRestored;
     this.fs = rootDir.getFileSystem(conf);
+    conf.setBoolean(MemStoreLAB.USEMSLAB_KEY, false);
 
     if (snapshotAlreadyRestored) {
       this.restoreDir = restoreDir;