Skip to content
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

Jump to bottom

xds: override bootstrap for xds server #8575

Merged
merged 5 commits into from Oct 7, 2021
Merged

xds: override bootstrap for xds server #8575

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efec9fa
override bootstrap for xds server
YifeiZhuang Oct 1, 2021
c648976
pubic
YifeiZhuang Oct 4, 2021
c28fed2
not public
YifeiZhuang Oct 7, 2021
4d21ce0
separate method overrideBootstrapForTest
YifeiZhuang Oct 7, 2021
ad7fcde
new shared client pool provider
YifeiZhuang Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions xds/src/main/java/io/grpc/xds/XdsServerBuilder.java
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@
import io.grpc.netty.NettyServerBuilder;
import io.grpc.xds.FilterChainMatchingProtocolNegotiators.FilterChainMatchingNegotiatorServerFactory;
import io.grpc.xds.XdsNameResolverProvider.XdsClientPoolFactory;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
Expand Down Expand Up @@ -136,6 +137,15 @@ XdsServerBuilder xdsClientPoolFactory(XdsClientPoolFactory xdsClientPoolFactory)
return this;
}

/**
* Allows providing bootstrap override, useful for testing.
*/
public XdsServerBuilder overrideBootstrapForTest(Map<String, ?> bootstrapOverride) {
this.xdsClientPoolFactory.setBootstrapOverride(
Copy link
Member

Choose a reason for hiding this comment

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

This is mutating a singleton.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

why we can't?

Copy link
Member

Choose a reason for hiding this comment

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

That means it would change channels and other servers. We went through this before on client-side. https://github.com/grpc/grpc-java/pull/8358/files/8f38f34705f34db27e9103928dc27dd856dc467e#r684332029

checkNotNull(bootstrapOverride, "bootstrapOverride"));
return this;
}

/**
* Returns the delegate {@link NettyServerBuilder} to allow experimental level
* transport-specific configuration. Note this API will always be experimental.
Expand Down