Skip to content

Commit 45c1d32

Browse files
committed
Fix scala 2.13 compilation error
1 parent 4801f71 commit 45c1d32

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package org.apache.openwhisk.core.containerpool.v2
1919

2020
import java.util.concurrent.atomic.AtomicInteger
2121
import akka.actor.{Actor, ActorRef, ActorRefFactory, Cancellable, Props}
22-
2322
import org.apache.openwhisk.common._
2423
import org.apache.openwhisk.core.connector.ContainerCreationError._
2524
import org.apache.openwhisk.core.connector.{
@@ -44,7 +43,7 @@ import org.apache.openwhisk.http.Messages
4443

4544
import scala.annotation.tailrec
4645
import scala.collection.concurrent.TrieMap
47-
import scala.collection.immutable
46+
import scala.collection.{immutable, mutable}
4847
import scala.concurrent.Future
4948
import scala.concurrent.duration._
5049
import scala.util.{Random, Try}
@@ -116,10 +115,14 @@ class FunctionPullingContainerPool(
116115
val prewarmedSize = prewarmedPool.size
117116
val busySize = busyPool.size
118117
val warmedSize = warmedPool.size
119-
val warmedPoolMap: Map[(String, String), Int] = warmedPool groupBy {
118+
val warmedPoolGroupMap = warmedPool groupBy {
120119
case (_, warmedData) => (warmedData.invocationNamespace, warmedData.action.toString)
121-
} mapValues (_.size)
122-
for((data, size) <- warmedPoolMap) {
120+
}
121+
val warmedPoolResultMap: mutable.Map[(String, String), Int] = mutable.Map.empty[(String, String), Int]
122+
warmedPoolGroupMap.foreach { data =>
123+
warmedPoolResultMap += (data._1 -> data._2.size)
124+
}
125+
for ((data, size) <- warmedPoolResultMap) {
123126
val tags: Option[Map[String, String]] = Some(Map("namespace" -> data._1, "action" -> data._2))
124127
MetricEmitter.emitHistogramMetric(LoggingMarkers.INVOKER_CONTAINERPOOL_CONTAINER("warmed", tags), size)
125128
}

0 commit comments

Comments
 (0)