Fix tests

Author: jiangpengcheng

core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/container/ContainerManager.scala

@@ -18,7 +18,6 @@
 package org.apache.openwhisk.core.scheduler.container
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.ThreadLocalRandom
-
 import akka.actor.{Actor, ActorRef, ActorRefFactory, ActorSystem, Props}
 import akka.event.Logging.InfoLevel
 import org.apache.kafka.clients.producer.RecordMetadata
@@ -33,7 +32,6 @@ import org.apache.openwhisk.core.entity.size._
 import org.apache.openwhisk.core.entity.{
   Annotations,
   ByteSize,
-  DocInfo,
   DocRevision,
   FullyQualifiedEntityName,
   InvokerInstanceId,
@@ -55,6 +53,7 @@ import org.apache.openwhisk.core.scheduler.message.{
   ReschedulingCreationJob,
   SuccessfulCreationJob
 }
+import org.apache.openwhisk.core.scheduler.queue.{MemoryQueueKey, QueuePool}
 import org.apache.openwhisk.core.service.{
   DeleteEvent,
   PutEvent,
@@ -570,28 +569,3 @@ object ContainerManager {
 }
 
 case class NoCapacityException(msg: String) extends Exception(msg)
-
-/**
- * TODO This needs to be moved to the QueueManager component that will be added later.
- */
-object QueuePool {
-  private val _queuePool = TrieMap[MemoryQueueKey, MemoryQueueValue]()
-
-  private[scheduler] def get(key: MemoryQueueKey) = _queuePool.get(key)
-
-  private[scheduler] def put(key: MemoryQueueKey, value: MemoryQueueValue) = _queuePool.put(key, value)
-
-  private[scheduler] def remove(key: MemoryQueueKey) = _queuePool.remove(key)
-
-  private[scheduler] def countLeader() = _queuePool.count(_._2.isLeader)
-
-  private[scheduler] def clear() = _queuePool.clear()
-
-  private[scheduler] def size = _queuePool.size
-
-  private[scheduler] def values = _queuePool.values
-
-  private[scheduler] def keys = _queuePool.keys
-}
-case class MemoryQueueKey(invocationNamespace: String, docInfo: DocInfo)
-case class MemoryQueueValue(queue: ActorRef, isLeader: Boolean)

core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/container/CreationJobManager.scala

@@ -34,6 +34,7 @@ import org.apache.openwhisk.core.scheduler.message.{
   ReschedulingCreationJob,
   SuccessfulCreationJob
 }
+import org.apache.openwhisk.core.scheduler.queue.{MemoryQueueKey, QueuePool}
 import pureconfig.loadConfigOrThrow
 
 import scala.collection.concurrent.TrieMap
@@ -64,7 +65,7 @@ class CreationJobManager(feedFactory: (ActorRefFactory, String, Int, Array[Byte]
   override def receive: Receive = {
     case RegisterCreationJob(
         ContainerCreationMessage(_, invocationNamespace, action, revision, actionMetaData, _, _, _, _, creationId)) =>
-      val isBlackboxInvocation = actionMetaData.toExecutableWhiskAction.exists(a => a.exec.pull);
+      val isBlackboxInvocation = actionMetaData.toExecutableWhiskAction.exists(a => a.exec.pull)
       registerJob(invocationNamespace, action, revision, creationId, isBlackboxInvocation)
 
     case FinishCreationJob(

tests/src/test/scala/org/apache/openwhisk/core/scheduler/container/test/ContainerManagerTests.scala

@@ -50,6 +50,7 @@ import org.apache.openwhisk.core.scheduler.message.{
   ReschedulingCreationJob,
   SuccessfulCreationJob
 }
+import org.apache.openwhisk.core.scheduler.queue.{MemoryQueueKey, MemoryQueueValue, QueuePool}
 import org.apache.openwhisk.core.service.WatchEndpointInserted
 import org.apache.openwhisk.core.{ConfigKeys, WhiskConfig}
 import org.junit.runner.RunWith
@@ -59,8 +60,8 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, FlatSpecLike, Matchers}
 import pureconfig.loadConfigOrThrow
 import spray.json.{JsArray, JsBoolean, JsString}
-
 import pureconfig.generic.auto._
+
 import scala.collection.mutable
 import scala.concurrent.Future
 import scala.concurrent.duration.{FiniteDuration, _}

tests/src/test/scala/org/apache/openwhisk/core/scheduler/container/test/CreationJobManagerTests.scala

@@ -29,6 +29,7 @@ import org.apache.openwhisk.core.entity._
 import org.apache.openwhisk.core.entity.size._
 import org.apache.openwhisk.core.etcd.EtcdKV.ContainerKeys.inProgressContainer
 import org.apache.openwhisk.core.scheduler.container._
+import org.apache.openwhisk.core.scheduler.message._
 import org.apache.openwhisk.core.scheduler.queue.{MemoryQueueKey, MemoryQueueValue, QueuePool}
 import org.apache.openwhisk.core.service.{RegisterData, UnregisterData}
 import org.apache.openwhisk.core.{ConfigKeys, WhiskConfig}
@@ -39,7 +40,7 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, FlatSpecLike, Matchers}
 import pureconfig.loadConfigOrThrow
 
-import scala.concurrent.duration.{FiniteDuration, _}
+import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ExecutionContextExecutor, Future}
 
 @RunWith(classOf[JUnitRunner])