changes

qubole · Sep 30, 2020 · 129a304 · 129a304
1 parent c781a09
commit 129a304
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/rubix-spi/src/main/java/com/qubole/rubix/spi/CacheConfig.java b/rubix-spi/src/main/java/com/qubole/rubix/spi/CacheConfig.java
@@ -12,11 +12,8 @@
  */
 package com.qubole.rubix.spi;
 
-import com.google.common.collect.ImmutableList;
 import org.apache.hadoop.conf.Configuration;
 
-import java.util.List;
-
 import static com.qubole.rubix.spi.utils.DataSizeUnits.MEGABYTES;
 
 /**

diff --git a/rubix-spi/src/main/java/com/qubole/rubix/spi/fop/ObjectPool.java b/rubix-spi/src/main/java/com/qubole/rubix/spi/fop/ObjectPool.java
@@ -77,7 +77,10 @@ public Poolable<T> borrowObject(String host)
     log.debug(this.name + " : Borrowing object for partition: " + host);
     for (int i = 0; i < 3; i++) { // try at most three times
       Poolable<T> result = getObject(host);
-      if (factory.validate(result.getObject())) {
+      if (result == null) {
+        continue;
+      }
+      else if (factory.validate(result.getObject())) {
         return result;
       }
       else {

diff --git a/rubix-spi/src/main/java/com/qubole/rubix/spi/fop/ObjectPoolPartition.java b/rubix-spi/src/main/java/com/qubole/rubix/spi/fop/ObjectPoolPartition.java
@@ -98,6 +98,7 @@ public boolean decreaseObject(Poolable<T> obj)
             this.host, obj.getHost());
     log.debug("Decreasing pool size object: " + obj);
     objectFactory.destroy(obj.getObject());
+    aliveObjectCount.decrementAndGet();
     obj.destroy();
     return true;
   }
@@ -109,7 +110,8 @@ public Poolable<T> getObject()
       takeSemaphore.tryAcquire(config.getMaxWaitMilliseconds(), TimeUnit.MILLISECONDS);
     }
     catch (InterruptedException e) {
-      throw new RuntimeException(e);
+      Thread.currentThread().interrupt();
+      return null;
     }
 
     try {