Merge pull request #2188 from HubSpot/fewer_threads

Thread and stream clean up
HubSpot · Mar 19, 2021 · 136686c · 136686c
2 parents fb1a57f + 2de124f
commit 136686c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...ityService/src/main/java/com/hubspot/singularity/SingularityManagedThreadPoolFactory.java b/...ityService/src/main/java/com/hubspot/singularity/SingularityManagedThreadPoolFactory.java
@@ -48,8 +48,12 @@ public synchronized ExecutorService get(String name) {
 
   public synchronized ExecutorService get(String name, int maxSize) {
     checkState(!stopped.get(), "already stopped");
-    ExecutorService service = Executors.newFixedThreadPool(
+    ExecutorService service = new ThreadPoolExecutor(
+      1,
       maxSize,
+      60L,
+      TimeUnit.SECONDS,
+      new LinkedBlockingQueue<>(),
       new ThreadFactoryBuilder().setNameFormat(name + "-%d").build()
     );
     executorPools.add(service);

diff --git a/SingularityService/src/main/java/com/hubspot/singularity/resources/TaskResource.java b/SingularityService/src/main/java/com/hubspot/singularity/resources/TaskResource.java
@@ -1395,6 +1395,10 @@ public void write(OutputStream output) throws WebApplicationException, IOExcepti
           requestBuilder.execute(this).get();
         } catch (ExecutionException | InterruptedException e) {
           LOG.error("Failed or interrupted while proxying a download from Mesos", e);
+        } finally {
+          if (wrappedOutputStream != null) {
+            wrappedOutputStream.close();
+          }
         }
       }
     }