Skip to content

fix missed etcd unregister data case for an existing container in container proxy #5390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 30, 2023
Merged

fix missed etcd unregister data case for an existing container in container proxy #5390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e73a5c
fix missed etcd unregister data case for an existing container
Mar 29, 2023
abc82fc
update tests
Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions .../org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down