commit a945a3e1a252ed0a153414b428fd181bbe61f5b0
author Rodric Rabbah <rabbah@us.ibm.com> Sun Aug 21 18:48:29 2016 -0400
committer Perry <perry@us.ibm.com> Tue Aug 23 09:42:14 2016 -0400
tree 80c0c2cf4ad1cbbec95baed5ea946438d59c4977
parent dd81852410360844adb4e6e3118e462920a9cf0c

Do not introduce stem cell container into the pool if it failed to initialize.

Small tweaks to log messages.

core/dispatcher/src/main/scala/whisk/core/container/ContainerPool.scala

diff --git a/core/dispatcher/src/main/scala/whisk/core/container/ContainerPool.scala b/core/dispatcher/src/main/scala/whisk/core/container/ContainerPool.scala
index bf5508a..d902aea 100644
--- a/core/dispatcher/src/main/scala/whisk/core/container/ContainerPool.scala
+++ b/core/dispatcher/src/main/scala/whisk/core/container/ContainerPool.scala
@@ -155,7 +155,7 @@
                 getImpl(nextPosition.next(), key, { () => makeWhiskContainer(action, auth) }) map {
                     case (c, initResult) =>
                         val cacheMsg = if (!initResult.isDefined) "(Cache Hit)" else "(Cache Miss)"
-                        info(this, s"ContainerPool.getAction obtained container ${c.id} ${cacheMsg}")
+                        info(this, s"getAction obtained container ${c.id} ${cacheMsg}")
                         (c.asInstanceOf[WhiskContainer], initResult)
                 }
             } finally {
@@ -299,7 +299,7 @@
      * This call can be slow but not while locking data structure so it does not interfere with other activations.
      */
     def putBack(container: Container, delete: Boolean = false)(implicit transid: TransactionId): Unit = {
-        info(this, s"ContainerPool.putBack returning container ${container.id}  delete = $delete")
+        info(this, s"putBack returning container ${container.id}  delete = $delete")
         if (!delete) // Docker operation outside sync block. Don't pause if we are deleting.
             runDockerOp { container.pause() }
         val toBeDeleted = this.synchronized { // Return container to pool logically and then optionally delete
@@ -455,10 +455,12 @@
         val limits = ActionLimits(TimeLimit(), defaultMemoryLimit, LogLimit())
         val containerName = makeContainerName("warmJsContainer")
         val con = makeGeneralContainer(warmNodejsKey, containerName, imageName, limits)
-        this.synchronized {
-            introduceContainer(warmNodejsKey, con)
-        }
-        info(this, s"ContainerPool: started warm nodejs container")
+        if (con.containerId.isDefined) {
+            this.synchronized {
+                introduceContainer(warmNodejsKey, con)
+            }
+            info(this, "Started warm nodejs container")
+        } else error(this, "Error starting warm container")
         con
     }
 
@@ -588,7 +590,7 @@
             val idleInfo = this.synchronized {
                 val idle = containerMap filter { case (container, ci) => ci.isIdle() && pred(ci) }
                 idle.keys foreach { con =>
-                    info(this, s"ContainerPool.removeAllIdle removing container ${con.id}")
+                    info(this, s"removeAllIdle removing container ${con.id}")
                 }
                 containerMap --= idle.keys
                 keyMap foreach { case (key, ciList) => ciList --= idle.values }
@@ -615,7 +617,7 @@
                 List()
             else {
                 val oldestConInfo = idle.minBy(_._2.lastUsed)._2
-                info(this, s"ContainerPool.removeOldestIdle removing container ${oldestConInfo.container.id}")
+                info(this, s"removeOldestIdle removing container ${oldestConInfo.container.id}")
                 removeContainerInfo(oldestConInfo)
                 List(oldestConInfo)
             }