fixing ContainerProxy - don't terminate early on failures (#4969)

* fixing ContainerProxy - don't terminate early on failures

* cleanup

Author: tysonnorris

core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala

@@ -335,6 +335,7 @@ class ContainerProxy(factory: (TransactionId,
             // implicitly via a FailureMessage which will be processed later when the state
             // transitions to Running
             val activation = ContainerProxy.constructWhiskActivation(job, None, Interval.zero, false, response)
+
             sendActiveAck(
               transid,
               activation,
@@ -497,7 +498,8 @@ class ContainerProxy(factory: (TransactionId,
       activeCount -= 1
       context.parent ! ContainerRemoved(true)
       abortBuffered()
-      stop()
+      rescheduleJob = true
+      goto(Removing)
 
     case _ => delay
   }

tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerProxyTests.scala

@@ -1307,7 +1307,7 @@ class ContainerProxyTests
 
     expectMsg(ContainerRemoved(true))
     //go to Removing state when a failure happens while others are in flight
-    expectNoMessage(100.milliseconds)
+    expectMsg(Transition(machine, Running, Removing))
     awaitAssert {
       factory.calls should have size 1
       container.initializeCount shouldBe 0
@@ -1437,7 +1437,7 @@ class ContainerProxyTests
     machine ! Run(action, message)
     expectMsg(Transition(machine, Uninitialized, Running))
     expectMsg(ContainerRemoved(true))
-
+    expectMsg(Transition(machine, Running, Removing))
     awaitAssert {
       factory.calls should have size 1
       container.initializeCount shouldBe 0