Skip to content

xds: deletion only to watchers of same control plane #9896

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
temawi merged 10 commits into from
Feb 17, 2023
Merged

xds: deletion only to watchers of same control plane #9896

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b59a6c
xds: del events to watchers of same control plane
temawi Feb 16, 2023
0a6e34d
Review feedback changes
temawi Feb 16, 2023
f18c9d9
Knock it off with all that verify()
temawi Feb 16, 2023
a3b120c
Remove extra logging
temawi Feb 16, 2023
627d512
fluent ControlPlaneRule
temawi Feb 16, 2023
35066cc
More review comment changes
temawi Feb 16, 2023
1c1a388
TYPO
temawi Feb 16, 2023
081251f
more test order, verify() shenanigans
temawi Feb 16, 2023
9235944
return XdsClient to the pool
temawi Feb 16, 2023
8364c01
Remove unnecessary XdsClient close()
temawi Feb 16, 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
6 changes: 5 additions & 1 deletion xds/src/test/java/io/grpc/xds/XdsClientFederationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.grpc.internal.ObjectPool;
import io.grpc.xds.Filter.NamedFilterConfig;
import io.grpc.xds.XdsClient.ResourceWatcher;
import io.grpc.xds.XdsListenerResource.LdsUpdate;
Expand Down Expand Up @@ -56,6 +57,7 @@ public class XdsClientFederationTest {
public ControlPlaneRule directpathPa = new ControlPlaneRule().setServerHostName(
"xdstp://server-one/envoy.config.listener.v3.Listener/test-server");

private ObjectPool<XdsClient> xdsClientPool;
private XdsClient xdsClient;
private boolean originalFederationStatus;

Expand All @@ -68,13 +70,15 @@ public void setUp() throws XdsInitializationException {

SharedXdsClientPoolProvider clientPoolProvider = new SharedXdsClientPoolProvider();
clientPoolProvider.setBootstrapOverride(defaultBootstrapOverride());
xdsClient = clientPoolProvider.getOrCreate().getObject();
xdsClientPool = clientPoolProvider.getOrCreate();
xdsClient = xdsClientPool.getObject();
}

@After
public void cleanUp() throws InterruptedException {
BootstrapperImpl.enableFederation = originalFederationStatus;
xdsClient.shutdown();
xdsClientPool.returnObject(xdsClient);
}

/**
Expand Down