This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new e061d08 Add Activation Error Logging Config to Container Proxy (#4981)
e061d08 is described below
commit e061d08ead21cdbb6df7a31eecdbf2ccb7f6052e
Author: Brendan Doyle <[email protected]>
AuthorDate: Sun Oct 11 18:28:56 2020 -0700
Add Activation Error Logging Config to Container Proxy (#4981)
* change activation error log level to warn
* add container proxy activation error logging config
Co-authored-by: Brendan Doyle <[email protected]>
---
.../org/apache/openwhisk/core/WhiskConfig.scala | 1 +
core/invoker/src/main/resources/application.conf | 6 ++++
.../core/containerpool/ContainerProxy.scala | 39 +++++++++++++---------
3 files changed, 31 insertions(+), 15 deletions(-)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
index 7aea661..a050ce7 100644
--- a/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
@@ -248,6 +248,7 @@ object ConfigKeys {
val containerProxy = "whisk.container-proxy"
val containerProxyTimeouts = s"$containerProxy.timeouts"
val containerProxyHealth = s"$containerProxy.action-health-check"
+ val containerProxyActivationErrorLogs =
s"$containerProxy.log-activation-errors"
val s3 = "whisk.s3"
val query = "whisk.query-limit"
diff --git a/core/invoker/src/main/resources/application.conf
b/core/invoker/src/main/resources/application.conf
index a11f454..8ddb68d 100644
--- a/core/invoker/src/main/resources/application.conf
+++ b/core/invoker/src/main/resources/application.conf
@@ -157,6 +157,12 @@ whisk {
check-period = 3 seconds # how often should prewarm containers be pinged
(tcp connection attempt)
max-fails = 3 # prewarm containers that fail this number of times will
be destroyed and replaced
}
+
+ log-activation-errors {
+ application-errors = false
+ developer-errors = false
+ whisk-errors = true
+ }
}
# tracing configuration
diff --git
a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala
b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala
index 51027e4..eebcc7c 100644
---
a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala
+++
b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala
@@ -258,6 +258,7 @@ class ContainerProxy(factory: (TransactionId,
instance: InvokerInstanceId,
poolConfig: ContainerPoolConfig,
healtCheckConfig: ContainerProxyHealthCheckConfig,
+ activationErrorLoggingConfig:
ContainerProxyActivationErrorLogConfig,
unusedTimeout: FiniteDuration,
pauseGrace: FiniteDuration,
testTcp: Option[ActorRef])
@@ -935,37 +936,41 @@ class ContainerProxy(factory: (TransactionId,
// Disambiguate activation errors and transform the Either into a
failed/successful Future respectively.
activationWithLogs.flatMap {
- case Right(act) if !act.response.isSuccess &&
!act.response.isApplicationError =>
- val truncatedResult = truncatedError(act)
- logging.info(
- this,
- s"Activation ${act.activationId} was unsuccessful at container
${stateData.getContainer} (with ${activeCount} still active) due to
${truncatedResult}")
- Future.failed(ActivationUnsuccessfulError(act))
- case Left(error) => Future.failed(error)
- case Right(act) =>
- if (act.response.isApplicationError) {
- val truncatedResult = truncatedError(act)
- logging.error(
- this,
- s"Activation ${act.activationId} at container
${stateData.getContainer} (with ${activeCount} still active) returned an error
${truncatedResult}")
+ case Right(act) if act.response.isSuccess ||
act.response.isApplicationError =>
+ if (act.response.isApplicationError &&
activationErrorLoggingConfig.applicationErrors) {
+ logTruncatedError(act)
}
Future.successful(act)
+ case Right(act) =>
+ if ((act.response.isContainerError &&
activationErrorLoggingConfig.developerErrors) ||
+ (act.response.isWhiskError &&
activationErrorLoggingConfig.whiskErrors)) {
+ logTruncatedError(act)
+ }
+ Future.failed(ActivationUnsuccessfulError(act))
+ case Left(error) => Future.failed(error)
}
}
//to ensure we don't blow up logs with potentially large activation response
error
- private def truncatedError(act: WhiskActivation) = {
+ private def logTruncatedError(act: WhiskActivation) = {
val truncate = 1024
val resultString = act.response.result.map(_.compactPrint).getOrElse("[no
result]")
- if (resultString.length > truncate) {
+ val truncatedResult = if (resultString.length > truncate) {
s"${resultString.take(truncate)}..."
} else {
resultString
}
+ val errorTypeMessage =
ActivationResponse.messageForCode(act.response.statusCode)
+ logging.warn(
+ this,
+ s"Activation ${act.activationId} at container ${stateData.getContainer}
(with $activeCount still active) returned a $errorTypeMessage:
$truncatedResult")
}
}
final case class ContainerProxyTimeoutConfig(idleContainer: FiniteDuration,
pauseGrace: FiniteDuration)
final case class ContainerProxyHealthCheckConfig(enabled: Boolean,
checkPeriod: FiniteDuration, maxFails: Int)
+final case class ContainerProxyActivationErrorLogConfig(applicationErrors:
Boolean,
+ developerErrors:
Boolean,
+ whiskErrors: Boolean)
object ContainerProxy {
def props(factory: (TransactionId,
@@ -982,6 +987,7 @@ object ContainerProxy {
poolConfig: ContainerPoolConfig,
healthCheckConfig: ContainerProxyHealthCheckConfig =
loadConfigOrThrow[ContainerProxyHealthCheckConfig](ConfigKeys.containerProxyHealth),
+ activationErrorLogConfig: ContainerProxyActivationErrorLogConfig =
activationErrorLogging,
unusedTimeout: FiniteDuration = timeouts.idleContainer,
pauseGrace: FiniteDuration = timeouts.pauseGrace,
tcp: Option[ActorRef] = None) =
@@ -994,6 +1000,7 @@ object ContainerProxy {
instance,
poolConfig,
healthCheckConfig,
+ activationErrorLogConfig,
unusedTimeout,
pauseGrace,
tcp))
@@ -1002,6 +1009,8 @@ object ContainerProxy {
private val containerCount = new Counter
val timeouts =
loadConfigOrThrow[ContainerProxyTimeoutConfig](ConfigKeys.containerProxyTimeouts)
+ val activationErrorLogging =
+
loadConfigOrThrow[ContainerProxyActivationErrorLogConfig](ConfigKeys.containerProxyActivationErrorLogs)
/**
* Generates a unique container name.
