From ef6a9472b882b123deb83ee4593c8f5cb2bde77c Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Mon, 3 Jun 2024 09:27:02 -0700
Subject: [PATCH] (PE-37376) Refactor instance-creation-concurrency default,
 set to 3

---
 .../services/jruby_pool_manager/impl/jruby_internal.clj         | 2 +-
 src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj   | 1 +
 .../puppetlabs/services/jruby_pool_manager/jruby_schemas.clj    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj b/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
index 6eba33e1..4a8d9e21 100644
--- a/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
+++ b/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
@@ -184,7 +184,7 @@
   [config :- jruby-schemas/JRubyConfig]
   (let [multithreaded (:multithreaded config)
         size (:max-active-instances config)
-        creation-concurrency (get config :instance-creation-concurrency 4)
+        creation-concurrency (:instance-creation-concurrency config)
         creation-service (Executors/newFixedThreadPool creation-concurrency)]
     (if multithreaded
       {:pool (instantiate-reference-pool size)
diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
index 4ee88b80..b32378b6 100644
--- a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
+++ b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
@@ -174,6 +174,7 @@
       (update-in [:environment-vars] #(or % {}))
       (update-in [:lifecycle] initialize-lifecycle-fns)
       (update-in [:multithreaded] #(if (nil? %) false %))
+      (update-in [:instance-creation-concurrency] #(if (nil? %) 3 %))
       jruby-internal/initialize-gem-path))
 
 (schema/defn register-event-handler
diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_schemas.clj b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_schemas.clj
index 4aab587f..812eeffa 100644
--- a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_schemas.clj
+++ b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_schemas.clj
@@ -95,7 +95,7 @@
    :profiling-mode SupportedJRubyProfilingModes
    :profiler-output-file schema/Str
    :multithreaded schema/Bool
-   (schema/optional-key :instance-creation-concurrency) schema/Int})
+   :instance-creation-concurrency schema/Int})
 
 (def JRubyPoolAgent
   "An agent configured for use in managing JRuby pools"