You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/07/23 01:43:06 UTC

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

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

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


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new 86376b2e28d HBASE-28743 Fixes NPE for TableSnapshotScanner by disabling mslab (#6110)
86376b2e28d is described below

commit 86376b2e28d192471133710431c84f21ac773b04
Author: Vineet Kumar Maheshwari <vi...@users.noreply.github.com>
AuthorDate: Tue Jul 23 07:09:15 2024 +0530

    HBASE-28743 Fixes NPE for TableSnapshotScanner by disabling mslab (#6110)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Pankaj Kumar <pa...@apache.org>
    (cherry picked from commit c2642996b17bd1edb5a141174e41f84a33411746)
---
 .../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 2c75f576a25..872c9a163c6 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
@@ -26,6 +26,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HRegionInfo;
 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;