HBASE-26944 Possible resource leak while creating new region scanner (#…

…4339) * HBASE-26944 Possible resource leak while creating new region scanner Signed-off-by: Duo Zhang <[email protected]> (cherry picked from commit 62e3efc)
apache · Apr 15, 2022 · 3510db4 · 3510db4
1 parent 785a546
commit 3510db4
Showing 1 changed file with 10 additions and 2 deletions.
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
@@ -3233,8 +3233,16 @@ private Pair<String, RegionScannerHolder> newRegionScanner(ScanRequest request,
     RegionScannerImpl coreScanner = region.getScanner(scan);
     Shipper shipper = coreScanner;
     RegionScanner scanner = coreScanner;
-    if (region.getCoprocessorHost() != null) {
-      scanner = region.getCoprocessorHost().postScannerOpen(scan, scanner);
+    try {
+      if (region.getCoprocessorHost() != null) {
+        scanner = region.getCoprocessorHost().postScannerOpen(scan, scanner);
+      }
+    } catch (Exception e) {
+      // Although region coprocessor is for advanced users and they should take care of the
+      // implementation to not damage the HBase system, closing the scanner on exception here does
+      // not have any bad side effect, so let's do it
+      scanner.close();
+      throw e;
     }
     long scannerId = scannerIdGenerator.generateNewScannerId();
     builder.setScannerId(scannerId);