Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[17.12] Fix event filter filtering on "or"#374

Merged
andrewhsu merged 1 commit intodocker-archive:17.12from
thaJeztah:17.12-backport-fix-namespace-filtering
Feb 13, 2018
Merged

[17.12] Fix event filter filtering on "or"#374
andrewhsu merged 1 commit intodocker-archive:17.12from
thaJeztah:17.12-backport-fix-namespace-filtering

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of moby/moby#35896 for 17.12.x

git checkout -b 17.12-backport-fix-namespace-filtering upstream/17.12
git cherry-pick -s -S -x -Xsubtree=components/engine 295bb09184fe473933498bb0efb59b8acb124f55

No conflicts

The event filter used two separate filter-conditions for "namespace" and "topic". As a result, both events matching "topic" and events matching "namespace" were subscribed to, causing events to be handled both by the "plugin" client, and "container" client.

This patch rewrites the filter to match only if both namespace and topic match.

Thanks to Stephen Day for providing the correct filter :)

Signed-off-by: Sebastiaan van Stijn github@gone.nl
(cherry picked from commit 295bb09)
Signed-off-by: Sebastiaan van Stijn github@gone.nl

@crosbymichael @stevvooe PTAL

The event filter used two separate filter-conditions for
"namespace" and "topic". As a result, both events matching
"topic" and events matching "namespace" were subscribed to,
causing events to be handled both by the "plugin" client, and
"container" client.

This patch rewrites the filter to match only if both namespace
and topic match.

Thanks to Stephen Day for providing the correct filter :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 295bb09)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 17.12.0 milestone Jan 2, 2018
@andrewhsu andrewhsu modified the milestones: 17.12.0, 17.12.1 Jan 3, 2018
cpuguy83 pushed a commit to cpuguy83/docker-ce that referenced this pull request Feb 7, 2018
Bump version to 17.08.0-dev
Upstream-commit: 1338f11ee72521f9f1552fac4a1340990d3dd855
Component: cli
Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit 2d24bc5 into docker-archive:17.12 Feb 13, 2018
@thaJeztah thaJeztah deleted the 17.12-backport-fix-namespace-filtering branch February 13, 2018 07:38
docker-jenkins pushed a commit that referenced this pull request Aug 15, 2019
Dockerfiles: remove unused GO_VERSION
Upstream-commit: 16b78be
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 6, 2019
…ingress_network

[19.03 backport] Add TC to check dynamic subnet for ingress network
Upstream-commit: 075a0201b96af7c023f22341a8876a50ecc1828b
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…ix-namespace-filtering

[17.12] Fix event filter filtering on "or"
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Dockerfiles: remove unused GO_VERSION
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants