You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by st...@apache.org on 2022/11/01 12:50:09 UTC
[openwhisk] branch master updated: Make the test stable (#5346)
This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 0f4b0c220 Make the test stable (#5346)
0f4b0c220 is described below
commit 0f4b0c220e050d408a650a8c5a90fbc54b52768a
Author: Dominic Kim <st...@apache.org>
AuthorDate: Tue Nov 1 21:50:01 2022 +0900
Make the test stable (#5346)
---
.../containerpool/v2/ActivationClientProxy.scala | 12 +++-
.../v2/FunctionPullingContainerProxy.scala | 6 +-
.../test/FunctionPullingContainerProxyTests.scala | 68 ++++++++++++----------
3 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/ActivationClientProxy.scala b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/ActivationClientProxy.scala
index f525f88de..dbfb7fa26 100644
--- a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/ActivationClientProxy.scala
+++ b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/ActivationClientProxy.scala
@@ -124,7 +124,9 @@ class ActivationClientProxy(
stay()
case Event(e: RescheduleActivation, client: Client) =>
- logging.info(this, s"[${containerId.asString}] got a reschedule message ${e.msg.activationId} for action: ${e.msg.action}")
+ logging.info(
+ this,
+ s"[${containerId.asString}] got a reschedule message ${e.msg.activationId} for action: ${e.msg.action}")
client.activationClient
.rescheduleActivation(
RescheduleRequest(e.invocationNamespace, e.fqn.serialize, e.rev.serialize, e.msg.serialize))
@@ -247,7 +249,9 @@ class ActivationClientProxy(
stay()
case Event(f: FailureMessage, c: Client) =>
- logging.error(this, s"[${containerId.asString}] some error happened for action: ${action} in state: $stateName, caused by: $f")
+ logging.error(
+ this,
+ s"[${containerId.asString}] some error happened for action: ${action} in state: $stateName, caused by: $f")
safelyCloseClient(c)
stay()
@@ -281,7 +285,9 @@ class ActivationClientProxy(
goto(ClientProxyRemoving)
case Event(ClientClosed, _) =>
- logging.info(this, s"[${containerId.asString}] the underlying client is closed, stopping the activation client proxy")
+ logging.info(
+ this,
+ s"[${containerId.asString}] the underlying client is closed, stopping the activation client proxy")
context.parent ! ClientClosed
stop()
diff --git a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala
index 28d3e1e1c..99423581f 100644
--- a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala
+++ b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala
@@ -339,7 +339,11 @@ class FunctionPullingContainerProxy(
// wait for container creation when cold start
case Event(ClientCreationCompleted(proxy), _: NonexistentData) =>
- self ! ClientCreationCompleted(proxy.orElse(Some(sender())))
+ akka.pattern.after(3.milliseconds, actorSystem.scheduler) {
+ self ! ClientCreationCompleted(proxy.orElse(Some(sender())))
+ Future.successful({})
+ }
+
stay()
// client was successfully obtained
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
index 04516d4a8..3923a9ed3 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
@@ -444,7 +444,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, transid)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -509,7 +509,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -573,7 +573,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -642,7 +642,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -883,7 +883,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -943,7 +943,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1015,7 +1015,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1094,7 +1094,7 @@ class FunctionPullingContainerProxyTests
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1180,7 +1180,7 @@ class FunctionPullingContainerProxyTests
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1265,7 +1265,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1342,7 +1342,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1423,7 +1423,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1500,7 +1500,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1576,7 +1576,11 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
+
+ awaitAssert {
+ machine.underlyingActor.stateData.getContainer should not be None
+ }
val containerId = machine.underlyingActor.stateData.getContainer match {
case Some(container) => container.containerId
@@ -1666,7 +1670,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
dataManagementService.expectMsg(
RegisterData(
ContainerKeys.existingContainers(
@@ -1775,7 +1779,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, noLogsAction, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1906,7 +1910,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -1980,7 +1984,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2057,7 +2061,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2136,7 +2140,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2226,7 +2230,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2289,7 +2293,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2355,7 +2359,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2425,7 +2429,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2508,7 +2512,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, Uninitialized, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2585,7 +2589,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2652,7 +2656,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2738,7 +2742,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2818,7 +2822,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, transid)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2889,7 +2893,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -2951,7 +2955,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)
@@ -3017,7 +3021,7 @@ class FunctionPullingContainerProxyTests
machine ! Initialize(invocationNamespace.asString, fqn, action, schedulerHost, rpcPort, messageTransId)
probe.expectMsg(Transition(machine, ContainerCreated, CreatingClient))
client.expectMsg(StartClient)
- client.send(machine, ClientCreationCompleted())
+ client.send(machine, ClientCreationCompleted(Some(client.ref)))
probe.expectMsg(Transition(machine, CreatingClient, ClientCreated))
expectInitialized(probe)