Skip to content

Commit 0b2d2ab

Browse files
authored
[New Scheduler] Implement FunctionPullingContainerProxy (#5113)
* Implement FunctionPullingContainerProxy * Fix type mismatch error * Fix cannot find Jsonwriter or JsonFormat type * Fix Unit companion object is not allowed in source * Add missing resourceTags and imagePullSecret * Make test case more stable * Remove unnecessary feature
1 parent 4ec5d96 commit 0b2d2ab

File tree

4 files changed

+4165
-7
lines changed

4 files changed

+4165
-7
lines changed

common/scala/src/main/scala/org/apache/openwhisk/common/TransactionId.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ object TransactionId {
238238
val invokerHealthManager = TransactionId(systemPrefix + "invokerHealthManager") // Invoker startup/shutdown or GC activity
239239
def invokerHealthActivation = TransactionId(systemPrefix + "invokerHealthActivation") // Invoker health activation
240240
val invokerWarmup = TransactionId(systemPrefix + "invokerWarmup") // Invoker warmup thread that makes stem-cell containers
241+
val invokerColdstart = TransactionId(systemPrefix + "invokerColdstart") //Invoker cold start thread
241242
val invokerNanny = TransactionId(systemPrefix + "invokerNanny") // Invoker nanny thread
242243
val dispatcher = TransactionId(systemPrefix + "dispatcher") // Kafka message dispatcher
243244
val loadbalancer = TransactionId(systemPrefix + "loadbalancer") // Loadbalancer thread

core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/ActivationClientProxy.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package org.apache.openwhisk.core.containerpool.v2
1919

2020
import akka.actor.ActorRef
21+
import org.apache.openwhisk.core.connector.ActivationMessage
22+
import org.apache.openwhisk.core.entity.{DocRevision, FullyQualifiedEntityName}
2123
import org.apache.openwhisk.core.scheduler.SchedulerEndpoints
2224

2325
// Event send by the actor
@@ -28,6 +30,14 @@ case object CloseClientProxy
2830
// Event received by the actor
2931
case object StartClient
3032
case class RequestActivation(lastDuration: Option[Long] = None, newScheduler: Option[SchedulerEndpoints] = None)
33+
case class RescheduleActivation(invocationNamespace: String,
34+
fqn: FullyQualifiedEntityName,
35+
rev: DocRevision,
36+
msg: ActivationMessage)
37+
38+
case object RetryRequestActivation
39+
case object ContainerWarmed
40+
case object StopClientProxy
3141

3242
// TODO, use grpc to fetch activation from memoryQueue
3343
class ActivationClientProxy {}

0 commit comments

Comments
 (0)