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

core: ManagedChannelImpl2. #2530

Merged
merged 15 commits into from
Jan 9, 2017
Merged

core: ManagedChannelImpl2. #2530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a79f2c1
Fork ManagedChannelImpl and its tests.
zhangkun83 Dec 16, 2016
850aefc
core: ManagedChannelImpl2.
zhangkun83 Dec 16, 2016
c0e1b2d
Cosmetic and documentation fixes.
zhangkun83 Dec 20, 2016
5225693
Bug fix: OobChannel.shutdownNow() should set shutdown to true.
zhangkun83 Dec 20, 2016
0ae084e
Bug fix: SubchannelImplImpl should schedule the timer within the lock.
zhangkun83 Dec 20, 2016
97c463b
Remove unused field from test.
zhangkun83 Dec 20, 2016
3bbe8c3
Switch to ObjectPool.
zhangkun83 Dec 28, 2016
014ffc2
Add tests for returning the shared executors.
zhangkun83 Dec 29, 2016
108345e
Stop clearing app executor when channel is terminated.
zhangkun83 Dec 29, 2016
55c05f7
shutdown() doesn't need to call maybeTerminateChannel();
zhangkun83 Dec 29, 2016
072b6c3
Add a comment.
zhangkun83 Dec 30, 2016
c52ee3e
Prefer runSerialized() to channelExecutor.
zhangkun83 Dec 30, 2016
60bc5a2
Do not clear subchannels and oobchannels at shutdownNow.
zhangkun83 Jan 3, 2017
68578f5
A few no-op changes.
zhangkun83 Jan 3, 2017
72ad669
Merge branch 'master' into lbv2_channel_review
zhangkun83 Jan 9, 2017
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
4 changes: 2 additions & 2 deletions core/src/main/java/io/grpc/internal/ClientCallImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ interface ClientTransportProvider {
/**
* Returns a transport for a new call.
*/
ClientTransport get(CallOptions callOptions);
ClientTransport get(CallOptions callOptions, Metadata headers);
}

ClientCallImpl<ReqT, RespT> setDecompressorRegistry(DecompressorRegistry decompressorRegistry) {
Expand Down Expand Up @@ -215,7 +215,7 @@ public void runInContext() {
if (!deadlineExceeded) {
updateTimeoutHeaders(effectiveDeadline, callOptions.getDeadline(),
context.getDeadline(), headers);
ClientTransport transport = clientTransportProvider.get(callOptions);
ClientTransport transport = clientTransportProvider.get(callOptions, headers);
Context origContext = context.attach();
try {
stream = transport.newStream(method, headers, callOptions, statsTraceCtx);
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import io.grpc.EquivalentAddressGroup;
import io.grpc.LoadBalancer;
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.NameResolver;
import io.grpc.ResolvedServerInfoGroup;
Expand Down Expand Up @@ -359,7 +360,7 @@ private void rescheduleIdleTimer() {

private final ClientTransportProvider transportProvider = new ClientTransportProvider() {
@Override
public ClientTransport get(CallOptions callOptions) {
public ClientTransport get(CallOptions callOptions, Metadata headers) {
LoadBalancer<ClientTransport> balancer = loadBalancer;
if (balancer == null) {
// Current state is either idle or in grace period
Expand Down
Loading