From 0d338a1820d93382a936061b91f87476e18f9812 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Wed, 4 Sep 2019 09:18:28 -0700
Subject: [PATCH] Revert "HBASE-22930 Set unique name to
 longCompactions/shortCompactions threads (#548)"

This reverts commit 0f0a3a22733cdef8a65fb707294a8d36ed0b591d.
---
 .../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 86beabcffe11..4767284ac49f 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 @@ private void createCompactionExecutors() {
     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());
   }