You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ma...@apache.org on 2018/02/19 14:40:27 UTC
[incubator-openwhisk] branch master updated: Remove finely
granulated metrics. (#3284)
This is an automated email from the ASF dual-hosted git repository.
markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 22317c4 Remove finely granulated metrics. (#3284)
22317c4 is described below
commit 22317c45ef7f729dee10343aa3d5c29c191cfa5f
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Mon Feb 19 15:40:24 2018 +0100
Remove finely granulated metrics. (#3284)
These metrics cause scalability issues in common time-series databases and as such are dangerous to day-to-day operations.
---
common/scala/src/main/scala/whisk/common/Logging.scala | 7 +++----
.../main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala | 2 +-
.../whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala | 2 +-
.../src/main/scala/whisk/core/containerpool/ContainerPool.scala | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common/scala/src/main/scala/whisk/common/Logging.scala b/common/scala/src/main/scala/whisk/common/Logging.scala
index e681eb5..4f4a801 100644
--- a/common/scala/src/main/scala/whisk/common/Logging.scala
+++ b/common/scala/src/main/scala/whisk/common/Logging.scala
@@ -242,8 +242,7 @@ object LoggingMarkers {
// Check invoker healthy state from loadbalancer
val LOADBALANCER_INVOKER_OFFLINE = LogMarkerToken(loadbalancer, "invokerOffline", count)
val LOADBALANCER_INVOKER_UNHEALTHY = LogMarkerToken(loadbalancer, "invokerUnhealthy", count)
- def LOADBALANCER_ACTIVATION_START(namespaceId: String) =
- LogMarkerToken(loadbalancer, s"activations_$namespaceId", count)
+ val LOADBALANCER_ACTIVATION_START = LogMarkerToken(loadbalancer, "activations", count)
// Time that is needed to execute the action
val INVOKER_ACTIVATION_RUN = LogMarkerToken(invoker, "activationRun", start)
@@ -258,8 +257,8 @@ object LoggingMarkers {
val INVOKER_ACTIVATION = LogMarkerToken(invoker, activation, start)
def INVOKER_DOCKER_CMD(cmd: String) = LogMarkerToken(invoker, s"docker.$cmd", start)
def INVOKER_RUNC_CMD(cmd: String) = LogMarkerToken(invoker, s"runc.$cmd", start)
- def INVOKER_CONTAINER_START(actionName: String, namespaceName: String, containerState: String) =
- LogMarkerToken(invoker, s"container_start_${containerState}_${namespaceName}_$actionName", count)
+ def INVOKER_CONTAINER_START(containerState: String) =
+ LogMarkerToken(invoker, s"container_start_${containerState}", count)
/*
* General markers
diff --git a/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala b/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala
index 76e523f..dc771a7 100644
--- a/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala
+++ b/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala
@@ -175,7 +175,7 @@ class ContainerPoolBalancer(config: WhiskConfig, controllerInstance: InstanceId)
invoker: InstanceId): Future[RecordMetadata] = {
implicit val transid = msg.transid
- MetricEmitter.emitCounterMetric(LoggingMarkers.LOADBALANCER_ACTIVATION_START(msg.user.uuid.asString))
+ MetricEmitter.emitCounterMetric(LoggingMarkers.LOADBALANCER_ACTIVATION_START)
val topic = s"invoker${invoker.toInt}"
val start = transid.started(
this,
diff --git a/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala b/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
index 5da863d..2ec822a 100644
--- a/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
+++ b/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
@@ -183,7 +183,7 @@ class ShardingContainerPoolBalancer(config: WhiskConfig, controllerInstance: Ins
val topic = s"invoker${invoker.toInt}"
- MetricEmitter.emitCounterMetric(LoggingMarkers.LOADBALANCER_ACTIVATION_START(msg.user.uuid.asString))
+ MetricEmitter.emitCounterMetric(LoggingMarkers.LOADBALANCER_ACTIVATION_START)
val start = transid.started(
this,
LoggingMarkers.CONTROLLER_KAFKA,
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/ContainerPool.scala b/core/invoker/src/main/scala/whisk/core/containerpool/ContainerPool.scala
index d0945ab..801fc09 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/ContainerPool.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/ContainerPool.scala
@@ -86,7 +86,7 @@ class ContainerPool(childFactory: ActorRefFactory => ActorRef,
r.msg.transid.mark(
this,
- LoggingMarkers.INVOKER_CONTAINER_START(actionName, namespaceName, containerState),
+ LoggingMarkers.INVOKER_CONTAINER_START(containerState),
s"containerStart containerState: $containerState action: $actionName namespace: $namespaceName activationId: $activationId",
akka.event.Logging.InfoLevel)
}
--
To stop receiving notification emails like this one, please contact
markusthoemmes@apache.org.