svn commit: r1639797 - in /hive/branches/branch-0.14: ./ hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java

[thejas]

Author: thejas
Date: Fri Nov 14 21:59:19 2014
New Revision: 1639797

URL: http://svn.apache.org/r1639797
Log:
HIVE-8830 : hcatalog process don't exit because of non daemon thread (Thejas 
Nair, reviewed by Eugene Koifman, Sushanth Sowmyan)

Modified:
    hive/branches/branch-0.14/   (props changed)
    
hive/branches/branch-0.14/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java

Propchange: hive/branches/branch-0.14/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1639249

Modified: 
hive/branches/branch-0.14/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
URL: 
http://svn.apache.org/viewvc/hive/branches/branch-0.14/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java?rev=1639797&r1=1639796&r2=1639797&view=diff
==============================================================================
--- 
hive/branches/branch-0.14/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
 (original)
+++ 
hive/branches/branch-0.14/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
 Fri Nov 14 21:59:19 2014
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMa
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -44,6 +45,7 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
 import com.google.common.cache.RemovalNotification;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 /**
  * A thread safe time expired cache for HiveMetaStoreClient
@@ -59,7 +61,7 @@ class HiveClientCache {
 
   private static final AtomicInteger nextId = new AtomicInteger(0);
 
-  private ScheduledFuture<?> cleanupHandle; // used to cleanup cache
+  private final ScheduledFuture<?> cleanupHandle; // used to cleanup cache
 
   // Since HiveMetaStoreClient is not threadsafe, hive clients are not  shared 
across threads.
   // Thread local variable containing each thread's unique ID, is used as one 
of the keys for the cache
@@ -91,6 +93,7 @@ class HiveClientCache {
     this.timeout = timeout;
     RemovalListener<HiveClientCacheKey, CacheableHiveMetaStoreClient> 
removalListener =
       new RemovalListener<HiveClientCacheKey, CacheableHiveMetaStoreClient>() {
+        @Override
         public void onRemoval(RemovalNotification<HiveClientCacheKey, 
CacheableHiveMetaStoreClient> notification) {
           CacheableHiveMetaStoreClient hiveMetaStoreClient = 
notification.getValue();
           if (hiveMetaStoreClient != null) {
@@ -108,6 +111,7 @@ class HiveClientCache {
 
     // Add a maintenance thread that will attempt to trigger a cache clean 
continuously
     Runnable cleanupThread = new Runnable() {
+      @Override
       public void run() {
         hiveCache.cleanUp();
       }
@@ -134,7 +138,10 @@ class HiveClientCache {
      * 5 seconds after the first timeout, and then after that, it'll check for 
whether or not
      * it can be cleaned every 
max(DEFAULT_HIVE_CACHE_EXPIRY_TIME_SECONDS,timeout) seconds
      */
-    cleanupHandle = Executors.newScheduledThreadPool(1).scheduleWithFixedDelay(
+    ThreadFactory daemonThreadFactory = (new 
ThreadFactoryBuilder()).setDaemon(true)
+        .setNameFormat("HiveClientCache-cleaner-%d").build();
+
+    cleanupHandle = Executors.newScheduledThreadPool(1, 
daemonThreadFactory).scheduleWithFixedDelay(
         cleanupThread,
         timeout + 5, cleanupInterval, TimeUnit.SECONDS);
 
@@ -285,7 +292,7 @@ class HiveClientCache {
    * Add # of current users on HiveMetaStoreClient, so that the client can be 
cleaned when no one is using it.
    */
   public static class CacheableHiveMetaStoreClient extends HiveMetaStoreClient 
{
-    private AtomicInteger users = new AtomicInteger(0);
+    private final AtomicInteger users = new AtomicInteger(0);
     private volatile boolean expiredFromCache = false;
     private boolean isClosed = false;
     private final long expiryTime;