Skip to content

Make runtime delete timeout configurable #5028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rabbah merged 1 commit into from
Nov 20, 2020
Merged

Make runtime delete timeout configurable #5028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/invoker/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,5 @@ whisk {
invoker {
protocol: http
}
runtime.delete.timeout = "30 seconds"
}
3 changes: 2 additions & 1 deletion ...scala/org/apache/openwhisk/core/containerpool/kubernetes/KubernetesContainerFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class KubernetesContainerFactory(
logging.info(this, "Cleaning up function runtimes")
val labels = Map("invoker" -> label, "release" -> KubernetesContainerFactoryProvider.release)
val cleaning = kubernetes.rm(labels, true)(TransactionId.invokerNanny)
Await.ready(cleaning, 30.seconds)
Await.ready(cleaning, KubernetesContainerFactoryProvider.runtimeDeleteTimeout)
}

override def createContainer(tid: TransactionId,
Expand All @@ -90,6 +90,7 @@ class KubernetesContainerFactory(
object KubernetesContainerFactoryProvider extends ContainerFactoryProvider {

val release = loadConfigOrThrow[String]("whisk.helm.release")
val runtimeDeleteTimeout = loadConfigOrThrow[FiniteDuration]("whisk.runtime.delete.timeout")

override def instance(actorSystem: ActorSystem,
logging: Logging,
Expand Down
1 change: 1 addition & 0 deletions core/standalone/src/main/resources/standalone-kcf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ whisk {
port-forwarding-enabled = true
}
helm.release = "release"
runtime.delete.timeout = "30 seconds"
}
1 change: 1 addition & 0 deletions tests/src/test/resources/application.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ whisk {
}

helm.release = "release"
runtime.delete.timeout = "30 seconds"
}

#test-only overrides so that tests can override defaults in application.conf (todo: move all defaults to reference.conf)
Expand Down