Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

86b94736

Commit 86b94736 authored 7 years ago by Mark D. Roth Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #10980 from markdroth/grpclb_deadline_fix

Make sure we set deadline for the LB call even without a pick.

parents 60093aba 64d922ae

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/grpc/impl/codegen/grpc_types.h 3 additions, 0 deletions

include/grpc/impl/codegen/grpc_types.h
src/core/ext/filters/client_channel/client_channel.c 1 addition, 2 deletions

src/core/ext/filters/client_channel/client_channel.c
src/core/ext/filters/client_channel/lb_policy.h 0 additions, 2 deletions

src/core/ext/filters/client_channel/lb_policy.h
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c 14 additions, 6 deletions

...core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
test/cpp/end2end/grpclb_end2end_test.cc 2 additions, 0 deletions

test/cpp/end2end/grpclb_end2end_test.cc

with 20 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment