tysonnorris commented on a change in pull request #3941: to address #3918,
reuse a container on applicationError
URL:
https://github.com/apache/incubator-openwhisk/pull/3941#discussion_r208404838
##########
File path:
tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
##########
@@ -385,6 +390,70 @@ class ContainerProxyTests
}
}
+ it should "complete the transaction and reuse the container on a failed run
IFF failure was applicationError" in within(
+ timeout) {
+ val container = new TestContainer {
+ override def run(parameters: JsObject, environment: JsObject, timeout:
FiniteDuration)(
+ implicit transid: TransactionId): Future[(Interval,
ActivationResponse)] = {
+ runCount += 1
+ //every other run fails
+ if (runCount % 2 == 0) {
+ Future.successful((runInterval, ActivationResponse.success()))
+ } else {
+ Future.successful((errorInterval,
ActivationResponse.applicationError(("boom"))))
+ }
+ }
+ }
+ val factory = createFactory(Future.successful(container))
+ val acker = createAcker()
+ val store = createStore
+ val collector = createCollector()
+
+ val machine =
+ childActorOf(
+ ContainerProxy
+ .props(factory, acker, store, collector, InvokerInstanceId(0),
poolConfig, pauseGrace = timeout))
+ registerCallback(machine)
+ preWarm(machine)
+
+ //first one will fail
+ run(machine, Started)
+
+ // Note that there are no intermediate state changes
+ //second one will succeed
+ run(machine, Ready)
+
+ awaitAssert {
+ factory.calls should have size 1
+ container.initializeCount shouldBe 1
+ container.runCount shouldBe 2
+ collector.calls should have size 2
+ container.suspendCount shouldBe 0
+ acker.calls should have size 2
+ store.calls should have size 2
Review comment:
Yes! done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
