[hbase] branch branch-2.2 updated: Revert "HBASE-22930 Set unique name to longCompactions/shortCompactions threads (#548)"

[stack]

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

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


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 6a778b8  Revert "HBASE-22930 Set unique name to 
longCompactions/shortCompactions threads (#548)"
6a778b8 is described below

commit 6a778b8affc1dedbabb8ed4e9553f9292d2cfdbf
Author: stack <st...@apache.org>
AuthorDate: Wed Sep 4 09:17:38 2019 -0700

    Revert "HBASE-22930 Set unique name to longCompactions/shortCompactions 
threads (#548)"
    
    This reverts commit d3cb7b4350d756942bc1899d43f8c535a2592d48.
---
 .../hadoop/hbase/regionserver/CompactSplit.java    | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
index bdb90be..bf58073 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
@@ -136,22 +136,19 @@ public class CompactSplit implements CompactionRequester, 
PropagatingConfigurati
     Preconditions.checkArgument(largeThreads > 0 && smallThreads > 0);
 
     final String n = Thread.currentThread().getName();
-    StealJobQueue<Runnable> stealJobQueue = new 
StealJobQueue<Runnable>(COMPARATOR);
 
-    AtomicInteger longCompactionThreadCounter = new AtomicInteger(0);
-    this.longCompactions =
-        new ThreadPoolExecutor(largeThreads, largeThreads, 60, 
TimeUnit.SECONDS, stealJobQueue,
-            new ThreadFactoryBuilder().setNameFormat(n + "-longCompactions-"
-                + longCompactionThreadCounter.getAndIncrement() + "-" + 
System.currentTimeMillis())
-                .setDaemon(true).build());
+    StealJobQueue<Runnable> stealJobQueue = new 
StealJobQueue<Runnable>(COMPARATOR);
+    this.longCompactions = new ThreadPoolExecutor(largeThreads, largeThreads, 
60,
+        TimeUnit.SECONDS, stealJobQueue,
+        new ThreadFactoryBuilder()
+            .setNameFormat(n + "-longCompactions-" + 
System.currentTimeMillis())
+            .setDaemon(true).build());
     this.longCompactions.setRejectedExecutionHandler(new Rejection());
     this.longCompactions.prestartAllCoreThreads();
-
-    AtomicInteger shortCompactionThreadCounter = new AtomicInteger(0);
-    this.shortCompactions = new ThreadPoolExecutor(smallThreads, smallThreads, 
60, TimeUnit.SECONDS,
-        stealJobQueue.getStealFromQueue(),
-        new ThreadFactoryBuilder().setNameFormat(n + "-shortCompactions-"
-            + shortCompactionThreadCounter.getAndIncrement() + "-" + 
System.currentTimeMillis())
+    this.shortCompactions = new ThreadPoolExecutor(smallThreads, smallThreads, 
60,
+        TimeUnit.SECONDS, stealJobQueue.getStealFromQueue(),
+        new ThreadFactoryBuilder()
+            .setNameFormat(n + "-shortCompactions-" + 
System.currentTimeMillis())
             .setDaemon(true).build());
     this.shortCompactions.setRejectedExecutionHandler(new Rejection());
   }