Skip scheduling for empty cold creation. (apache#5316)

nuvolaris · Nov 23, 2022 · 6da24a2 · 6da24a2
1 parent d531769
commit 6da24a2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/...duler/src/main/scala/org/apache/openwhisk/core/scheduler/container/ContainerManager.scala b/...duler/src/main/scala/org/apache/openwhisk/core/scheduler/container/ContainerManager.scala
@@ -181,20 +181,22 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,
  }
 
  // handle cold creations
- ContainerManager
- .schedule(updatedInvokers, coldCreations.map(_._1), memory)
- .map { pair =>
- pair.invokerId match {
- // an invoker is assigned for the msg
- case Some(instanceId) =>
- creationJobManager ! RegisterCreationJob(pair.msg)
- sendCreationContainerToInvoker(messagingProducer, instanceId.instance, pair.msg)
-
- // if a chosen invoker does not exist, it means it failed to find a matching invoker for the msg.
- case _ =>
- pair.err.foreach(error => sendState(pair.msg, error, error))
+ if (coldCreations.nonEmpty) {
+ ContainerManager
+ .schedule(updatedInvokers, coldCreations.map(_._1), memory)
+ .map { pair =>
+ pair.invokerId match {
+ // an invoker is assigned for the msg
+ case Some(instanceId) =>
+ creationJobManager ! RegisterCreationJob(pair.msg)
+ sendCreationContainerToInvoker(messagingProducer, instanceId.instance, pair.msg)
+
+ // if a chosen invoker does not exist, it means it failed to find a matching invoker for the msg.
+ case _ =>
+ pair.err.foreach(error => sendState(pair.msg, error, error))
+ }
  }
-  }
+ }
  }
  }
  }

diff --git a/...test/scala/org/apache/openwhisk/core/scheduler/container/test/ContainerManagerTests.scala b/...test/scala/org/apache/openwhisk/core/scheduler/container/test/ContainerManagerTests.scala
@@ -136,7 +136,7 @@ class ContainerManagerTests
 
  def mockMessaging(receiver: Option[ActorRef] = None): MessagingProvider = {
  val messaging = stub[MessagingProvider]
- val producer = receiver.map(fakeProducer(_)).getOrElse(stub[MessageProducer])
+ val producer = receiver.map(fakeProducer).getOrElse(stub[MessageProducer])
  val consumer = stub[MessageConsumer]
  (messaging
  .getProducer(_: WhiskConfig, _: Option[ByteSize])(_: Logging, _: ActorSystem))