HBASE-24436 The store file open and close thread pool should be shared at the region level

Author: Joseph295

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -695,6 +695,7 @@ void sawNoSuchFamily() {
   private RegionCoprocessorHost coprocessorHost;
 
   private TableDescriptor htableDescriptor = null;
+  private ThreadPoolExecutor storeFileOpenAndCloseThreadPool;
   private RegionSplitPolicy splitPolicy;
   private FlushPolicy flushPolicy;
 
@@ -799,6 +800,8 @@ public HRegion(final HRegionFileSystem fs, final WAL wal, final Configuration co
         }
       }
     }
+    storeFileOpenAndCloseThreadPool = newStoreFileOpenAndCloseThreadPool(
+      "StoreFileOpenAndClose-" + getRegionInfo().getEncodedName());
 
     this.rsServices = rsServices;
     if (this.rsServices != null) {
@@ -1769,7 +1772,7 @@ public Pair<byte[], Collection<HStoreFile>> call() throws IOException {
           storeCloserThreadPool.shutdownNow();
         }
       }
-
+      storeFileOpenAndCloseThreadPool.shutdownNow();
       status.setStatus("Writing region close event to WAL");
       // Always write close marker to wal even for read only table. This is not a big problem as we
       // do not write any data into the region; it is just a meta edit in the WAL file.
@@ -1888,13 +1891,16 @@ protected ThreadPoolExecutor getStoreOpenAndCloseThreadPool(
     return getOpenAndCloseThreadPool(maxThreads, threadNamePrefix);
   }
 
-  protected ThreadPoolExecutor getStoreFileOpenAndCloseThreadPool(
+  public ThreadPoolExecutor getStoreFileOpenAndCloseThreadPool() {
+    return storeFileOpenAndCloseThreadPool;
+  }
+
+  protected ThreadPoolExecutor newStoreFileOpenAndCloseThreadPool(
       final String threadNamePrefix) {
     int numStores = Math.max(1, this.htableDescriptor.getColumnFamilyCount());
-    int maxThreads = Math.max(1,
+    int maxThreads = Math.max(numStores,
         conf.getInt(HConstants.HSTORE_OPEN_AND_CLOSE_THREADS_MAX,
-            HConstants.DEFAULT_HSTORE_OPEN_AND_CLOSE_THREADS_MAX)
-            / numStores);
+            HConstants.DEFAULT_HSTORE_OPEN_AND_CLOSE_THREADS_MAX));
     return getOpenAndCloseThreadPool(maxThreads, threadNamePrefix);
   }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java

@@ -555,11 +555,9 @@ private List<HStoreFile> openStoreFiles(Collection<StoreFileInfo> files, boolean
     }
     // initialize the thread pool for opening store files in parallel..
     ThreadPoolExecutor storeFileOpenerThreadPool =
-      this.region.getStoreFileOpenAndCloseThreadPool("StoreFileOpener-"
-        + this.region.getRegionInfo().getEncodedName() + "-" + this.getColumnFamilyName());
+      this.region.getStoreFileOpenAndCloseThreadPool();
     CompletionService<HStoreFile> completionService =
       new ExecutorCompletionService<>(storeFileOpenerThreadPool);
-
     int totalValidStoreFile = 0;
     for (StoreFileInfo storeFileInfo : files) {
       // open each store file in parallel
@@ -590,7 +588,7 @@ private List<HStoreFile> openStoreFiles(Collection<StoreFileInfo> files, boolean
         }
       }
     } finally {
-      storeFileOpenerThreadPool.shutdownNow();
+
     }
     if (ioe != null) {
       // close StoreFile readers
@@ -955,9 +953,7 @@ public ImmutableCollection<HStoreFile> close() throws IOException {
       if (!result.isEmpty()) {
         // initialize the thread pool for closing store files in parallel.
         ThreadPoolExecutor storeFileCloserThreadPool = this.region
-            .getStoreFileOpenAndCloseThreadPool("StoreFileCloser-"
-              + this.region.getRegionInfo().getEncodedName() + "-" + this.getColumnFamilyName());
-
+            .getStoreFileOpenAndCloseThreadPool();
         // close each store file in parallel
         CompletionService<Void> completionService =
           new ExecutorCompletionService<>(storeFileCloserThreadPool);
@@ -991,7 +987,7 @@ public Void call() throws IOException {
             }
           }
         } finally {
-          storeFileCloserThreadPool.shutdownNow();
+
         }
         if (ioe != null) {
           throw ioe;