[incubator-openwhisk] branch master updated: Update LeanBalancer for invoke SPI change (#4478)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new ae9ff6a  Update LeanBalancer for invoke SPI change (#4478)
ae9ff6a is described below

commit ae9ff6ac7e352f98883a4c0418172b0aa76d8f9b
Author: Pavel Kravchenko <kp...@il.ibm.com>
AuthorDate: Wed May 15 17:14:24 2019 +0300

    Update LeanBalancer for invoke SPI change (#4478)
---
 .../org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala
index 76482b8..d6a6b8e 100644
--- a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala
+++ b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala
@@ -25,7 +25,7 @@ import org.apache.openwhisk.core.connector._
 import org.apache.openwhisk.core.containerpool.ContainerPoolConfig
 import org.apache.openwhisk.core.entity.ControllerInstanceId
 import org.apache.openwhisk.core.entity._
-import org.apache.openwhisk.core.invoker.InvokerReactive
+import org.apache.openwhisk.core.invoker.InvokerProvider
 import org.apache.openwhisk.core.{ConfigKeys, WhiskConfig}
 import org.apache.openwhisk.spi.SpiLoader
 import org.apache.openwhisk.utils.ExecutionContextFactory
@@ -69,9 +69,8 @@ class LeanBalancer(config: WhiskConfig,
   /** Creates an invoker for executing user actions. There is only one invoker in the lean model. */
   private def makeALocalThreadedInvoker() {
     implicit val ec = ExecutionContextFactory.makeCachedThreadPoolExecutionContext()
-    val actorSystema: ActorSystem =
-      ActorSystem(name = "invoker-actor-system", defaultExecutionContext = Some(ec))
-    new InvokerReactive(config, invokerName, messageProducer)(actorSystema, implicitly)
+    val limitConfig: ConcurrencyLimitConfig = loadConfigOrThrow[ConcurrencyLimitConfig](ConfigKeys.concurrencyLimit)
+    SpiLoader.get[InvokerProvider].instance(config, invokerName, messageProducer, poolConfig, limitConfig)
   }
 
   makeALocalThreadedInvoker()