Exclude warmed containers in disabled invokers.

style95 · style95 · commit 5cf819e8e575 · 2022-08-19T11:11:26.000+09:00
diff --git a/core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/container/ContainerManager.scala b/core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/container/ContainerManager.scala
@@ -167,6 +167,7 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,
               }
           }
 
+          // update the resource usage of invokers to apply changes from warmed creations.
           val updatedInvokers = chosenInvokers.foldLeft(invokers) { (invokers, chosenInvoker) =>
             chosenInvoker match {
               case Some((chosenInvoker, msg)) =>
@@ -176,6 +177,7 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,
             }
           }
 
+          // handle cold creations
           ContainerManager
             .schedule(updatedInvokers, coldCreations.map(_._1), memory)
             .map { pair =>
@@ -185,7 +187,7 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,
                   creationJobManager ! RegisterCreationJob(pair.msg)
                   sendCreationContainerToInvoker(messagingProducer, instanceId.instance, pair.msg)
 
-                // no matching invoker is found for the reason.
+                // if a chosen invoker does not exist, it means it failed to find a matching invoker for the msg.
                 case _ =>
                   for {
                     error <- pair.err

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
	`170`	`+ // update the resource usage of invokers to apply changes from warmed creations.`
`170`	`171`	`val updatedInvokers = chosenInvokers.foldLeft(invokers) { (invokers, chosenInvoker) =>`
`171`	`172`	`chosenInvoker match {`
`172`	`173`	`case Some((chosenInvoker, msg)) =>`
`@@ -176,6 +177,7 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,`
`176`	`177`	`}`
`177`	`178`	`}`
`178`	`179`
	`180`	`+ // handle cold creations`
`179`	`181`	`ContainerManager`
`180`	`182`	`.schedule(updatedInvokers, coldCreations.map(_._1), memory)`
`181`	`183`	`.map { pair =>`
`@@ -185,7 +187,7 @@ class ContainerManager(jobManagerFactory: ActorRefFactory => ActorRef,`
`185`	`187`	`creationJobManager ! RegisterCreationJob(pair.msg)`
`186`	`188`	`sendCreationContainerToInvoker(messagingProducer, instanceId.instance, pair.msg)`
`187`	`189`
`188`		`- // no matching invoker is found for the reason.`
	`190`	`+ // if a chosen invoker does not exist, it means it failed to find a matching invoker for the msg.`
`189`	`191`	`case _ =>`
`190`	`192`	`for {`
`191`	`193`	`error <- pair.err`