[openwhisk] branch master updated: fix missed etcd unregister data case for an existing container in container proxy (#5390)

[bdoyle]

This is an automated email from the ASF dual-hosted git repository.

bdoyle 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 7c94e9ba0 fix missed etcd unregister data case for an existing 
container in container proxy (#5390)
7c94e9ba0 is described below

commit 7c94e9ba05ec9dbd59303672cc81b963d53351ba
Author: Brendan Doyle <bdoyle0...@gmail.com>
AuthorDate: Thu Mar 30 11:59:48 2023 -0700

    fix missed etcd unregister data case for an existing container in container 
proxy (#5390)
    
    * fix missed etcd unregister data case for an existing container
    
    * update tests
    
    ---------
    
    Co-authored-by: Brendan Doyle <brend...@qualtrics.com>
---
 .../core/containerpool/v2/FunctionPullingContainerProxy.scala      | 7 ++++++-
 .../containerpool/v2/test/FunctionPullingContainerProxyTests.scala | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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 9bbbb598a..c5fa5a6f2 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
@@ -611,7 +611,12 @@ class FunctionPullingContainerProxy(
       if (runningActivations.isEmpty) {
         logging.info(this, s"The Client closed in state: $stateName, action: 
${data.action}")
         // Stop ContainerProxy(ActivationClientProxy will stop also when send 
ClientClosed to ContainerProxy).
-        cleanUp(data.container, None, false)
+        cleanUp(
+          data.container,
+          data.invocationNamespace,
+          data.action.fullyQualifiedName(withVersion = true),
+          data.action.rev,
+          None)
       } else {
         logging.info(
           this,
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 52362256b..36e1416fd 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
@@ -961,7 +961,7 @@ class FunctionPullingContainerProxyTests
     }
     client.send(machine, ClientClosed)
 
-    probe.expectMsgAllOf(ContainerRemoved(false), Transition(machine, Running, 
Removing))
+    probe.expectMsgAllOf(ContainerRemoved(true), Transition(machine, Running, 
Removing))
 
     awaitAssert {
       factory.calls should have size 1
@@ -1614,7 +1614,7 @@ class FunctionPullingContainerProxyTests
     client.expectMsg(GracefulShutdown)
     client.send(machine, ClientClosed)
 
-    probe.expectMsgAllOf(ContainerRemoved(false), Transition(machine, Running, 
Removing))
+    probe.expectMsgAllOf(ContainerRemoved(true), Transition(machine, Running, 
Removing))
 
     awaitAssert {
       factory.calls should have size 1