You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ni...@apache.org on 2022/05/26 08:00:50 UTC
[openwhisk] 07/08: Fix scala 2.13 compilation error
This is an automated email from the ASF dual-hosted git repository.
ningyougang pushed a commit to branch add-container-count-metric
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
commit 8ba0902595d3aaf58354560cd5001fefd138fe0b
Author: ning.yougang <ni...@navercorp.com>
AuthorDate: Thu May 26 13:22:09 2022 +0800
Fix scala 2.13 compilation error
---
.../core/containerpool/v2/FunctionPullingContainerPool.scala | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerPool.scala b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerPool.scala
index a1396b7a0..d305ef349 100644
--- a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerPool.scala
+++ b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerPool.scala
@@ -19,7 +19,6 @@ package org.apache.openwhisk.core.containerpool.v2
import java.util.concurrent.atomic.AtomicInteger
import akka.actor.{Actor, ActorRef, ActorRefFactory, Cancellable, Props}
-
import org.apache.openwhisk.common._
import org.apache.openwhisk.core.connector.ContainerCreationError._
import org.apache.openwhisk.core.connector.{
@@ -44,7 +43,7 @@ import org.apache.openwhisk.http.Messages
import scala.annotation.tailrec
import scala.collection.concurrent.TrieMap
-import scala.collection.immutable
+import scala.collection.{immutable, mutable}
import scala.concurrent.Future
import scala.concurrent.duration._
import scala.util.{Random, Try}
@@ -116,10 +115,10 @@ class FunctionPullingContainerPool(
val prewarmedSize = prewarmedPool.size
val busySize = busyPool.size
val warmedSize = warmedPool.size
- val warmedPoolMap: Map[(String, String), Int] = warmedPool groupBy {
+ val warmedPoolMap = warmedPool groupBy {
case (_, warmedData) => (warmedData.invocationNamespace, warmedData.action.toString)
} mapValues (_.size)
- for((data, size) <- warmedPoolMap) {
+ for ((data, size) <- warmedPoolMap) {
val tags: Option[Map[String, String]] = Some(Map("namespace" -> data._1, "action" -> data._2))
MetricEmitter.emitHistogramMetric(LoggingMarkers.INVOKER_CONTAINERPOOL_CONTAINER("warmed", tags), size)
}