Skip to content

Commit bab8123

Browse files
markdrothmarkdroth
committed
LB policy picker API
1 parent 56006f0 commit bab8123

34 files changed

+2036
-2931
lines changed

‎BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -1070,10 +1070,10 @@ grpc_cc_library(
10701070
"src/core/ext/filters/client_channel/parse_address.cc",
10711071
"src/core/ext/filters/client_channel/proxy_mapper.cc",
10721072
"src/core/ext/filters/client_channel/proxy_mapper_registry.cc",
1073-
"src/core/ext/filters/client_channel/request_routing.cc",
10741073
"src/core/ext/filters/client_channel/resolver.cc",
10751074
"src/core/ext/filters/client_channel/resolver_registry.cc",
10761075
"src/core/ext/filters/client_channel/resolver_result_parsing.cc",
1076+
"src/core/ext/filters/client_channel/resolving_lb_policy.cc",
10771077
"src/core/ext/filters/client_channel/retry_throttle.cc",
10781078
"src/core/ext/filters/client_channel/server_address.cc",
10791079
"src/core/ext/filters/client_channel/subchannel.cc",
@@ -1096,11 +1096,11 @@ grpc_cc_library(
10961096
"src/core/ext/filters/client_channel/parse_address.h",
10971097
"src/core/ext/filters/client_channel/proxy_mapper.h",
10981098
"src/core/ext/filters/client_channel/proxy_mapper_registry.h",
1099-
"src/core/ext/filters/client_channel/request_routing.h",
11001099
"src/core/ext/filters/client_channel/resolver.h",
11011100
"src/core/ext/filters/client_channel/resolver_factory.h",
11021101
"src/core/ext/filters/client_channel/resolver_registry.h",
11031102
"src/core/ext/filters/client_channel/resolver_result_parsing.h",
1103+
"src/core/ext/filters/client_channel/resolving_lb_policy.h",
11041104
"src/core/ext/filters/client_channel/retry_throttle.h",
11051105
"src/core/ext/filters/client_channel/server_address.h",
11061106
"src/core/ext/filters/client_channel/subchannel.h",

‎CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1232,10 +1232,10 @@ add_library(grpc
12321232
src/core/ext/filters/client_channel/parse_address.cc
12331233
src/core/ext/filters/client_channel/proxy_mapper.cc
12341234
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
1235-
src/core/ext/filters/client_channel/request_routing.cc
12361235
src/core/ext/filters/client_channel/resolver.cc
12371236
src/core/ext/filters/client_channel/resolver_registry.cc
12381237
src/core/ext/filters/client_channel/resolver_result_parsing.cc
1238+
src/core/ext/filters/client_channel/resolving_lb_policy.cc
12391239
src/core/ext/filters/client_channel/retry_throttle.cc
12401240
src/core/ext/filters/client_channel/server_address.cc
12411241
src/core/ext/filters/client_channel/subchannel.cc
@@ -1587,10 +1587,10 @@ add_library(grpc_cronet
15871587
src/core/ext/filters/client_channel/parse_address.cc
15881588
src/core/ext/filters/client_channel/proxy_mapper.cc
15891589
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
1590-
src/core/ext/filters/client_channel/request_routing.cc
15911590
src/core/ext/filters/client_channel/resolver.cc
15921591
src/core/ext/filters/client_channel/resolver_registry.cc
15931592
src/core/ext/filters/client_channel/resolver_result_parsing.cc
1593+
src/core/ext/filters/client_channel/resolving_lb_policy.cc
15941594
src/core/ext/filters/client_channel/retry_throttle.cc
15951595
src/core/ext/filters/client_channel/server_address.cc
15961596
src/core/ext/filters/client_channel/subchannel.cc
@@ -1965,10 +1965,10 @@ add_library(grpc_test_util
19651965
src/core/ext/filters/client_channel/parse_address.cc
19661966
src/core/ext/filters/client_channel/proxy_mapper.cc
19671967
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
1968-
src/core/ext/filters/client_channel/request_routing.cc
19691968
src/core/ext/filters/client_channel/resolver.cc
19701969
src/core/ext/filters/client_channel/resolver_registry.cc
19711970
src/core/ext/filters/client_channel/resolver_result_parsing.cc
1971+
src/core/ext/filters/client_channel/resolving_lb_policy.cc
19721972
src/core/ext/filters/client_channel/retry_throttle.cc
19731973
src/core/ext/filters/client_channel/server_address.cc
19741974
src/core/ext/filters/client_channel/subchannel.cc
@@ -2290,10 +2290,10 @@ add_library(grpc_test_util_unsecure
22902290
src/core/ext/filters/client_channel/parse_address.cc
22912291
src/core/ext/filters/client_channel/proxy_mapper.cc
22922292
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
2293-
src/core/ext/filters/client_channel/request_routing.cc
22942293
src/core/ext/filters/client_channel/resolver.cc
22952294
src/core/ext/filters/client_channel/resolver_registry.cc
22962295
src/core/ext/filters/client_channel/resolver_result_parsing.cc
2296+
src/core/ext/filters/client_channel/resolving_lb_policy.cc
22972297
src/core/ext/filters/client_channel/retry_throttle.cc
22982298
src/core/ext/filters/client_channel/server_address.cc
22992299
src/core/ext/filters/client_channel/subchannel.cc
@@ -2626,10 +2626,10 @@ add_library(grpc_unsecure
26262626
src/core/ext/filters/client_channel/parse_address.cc
26272627
src/core/ext/filters/client_channel/proxy_mapper.cc
26282628
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
2629-
src/core/ext/filters/client_channel/request_routing.cc
26302629
src/core/ext/filters/client_channel/resolver.cc
26312630
src/core/ext/filters/client_channel/resolver_registry.cc
26322631
src/core/ext/filters/client_channel/resolver_result_parsing.cc
2632+
src/core/ext/filters/client_channel/resolving_lb_policy.cc
26332633
src/core/ext/filters/client_channel/retry_throttle.cc
26342634
src/core/ext/filters/client_channel/server_address.cc
26352635
src/core/ext/filters/client_channel/subchannel.cc
@@ -3483,10 +3483,10 @@ add_library(grpc++_cronet
34833483
src/core/ext/filters/client_channel/parse_address.cc
34843484
src/core/ext/filters/client_channel/proxy_mapper.cc
34853485
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
3486-
src/core/ext/filters/client_channel/request_routing.cc
34873486
src/core/ext/filters/client_channel/resolver.cc
34883487
src/core/ext/filters/client_channel/resolver_registry.cc
34893488
src/core/ext/filters/client_channel/resolver_result_parsing.cc
3489+
src/core/ext/filters/client_channel/resolving_lb_policy.cc
34903490
src/core/ext/filters/client_channel/retry_throttle.cc
34913491
src/core/ext/filters/client_channel/server_address.cc
34923492
src/core/ext/filters/client_channel/subchannel.cc

‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -3758,10 +3758,10 @@ LIBGRPC_SRC = \
37583758
src/core/ext/filters/client_channel/parse_address.cc \
37593759
src/core/ext/filters/client_channel/proxy_mapper.cc \
37603760
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
3761-
src/core/ext/filters/client_channel/request_routing.cc \
37623761
src/core/ext/filters/client_channel/resolver.cc \
37633762
src/core/ext/filters/client_channel/resolver_registry.cc \
37643763
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
3764+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
37653765
src/core/ext/filters/client_channel/retry_throttle.cc \
37663766
src/core/ext/filters/client_channel/server_address.cc \
37673767
src/core/ext/filters/client_channel/subchannel.cc \
@@ -4107,10 +4107,10 @@ LIBGRPC_CRONET_SRC = \
41074107
src/core/ext/filters/client_channel/parse_address.cc \
41084108
src/core/ext/filters/client_channel/proxy_mapper.cc \
41094109
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4110-
src/core/ext/filters/client_channel/request_routing.cc \
41114110
src/core/ext/filters/client_channel/resolver.cc \
41124111
src/core/ext/filters/client_channel/resolver_registry.cc \
41134112
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4113+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
41144114
src/core/ext/filters/client_channel/retry_throttle.cc \
41154115
src/core/ext/filters/client_channel/server_address.cc \
41164116
src/core/ext/filters/client_channel/subchannel.cc \
@@ -4478,10 +4478,10 @@ LIBGRPC_TEST_UTIL_SRC = \
44784478
src/core/ext/filters/client_channel/parse_address.cc \
44794479
src/core/ext/filters/client_channel/proxy_mapper.cc \
44804480
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4481-
src/core/ext/filters/client_channel/request_routing.cc \
44824481
src/core/ext/filters/client_channel/resolver.cc \
44834482
src/core/ext/filters/client_channel/resolver_registry.cc \
44844483
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4484+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
44854485
src/core/ext/filters/client_channel/retry_throttle.cc \
44864486
src/core/ext/filters/client_channel/server_address.cc \
44874487
src/core/ext/filters/client_channel/subchannel.cc \
@@ -4790,10 +4790,10 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
47904790
src/core/ext/filters/client_channel/parse_address.cc \
47914791
src/core/ext/filters/client_channel/proxy_mapper.cc \
47924792
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4793-
src/core/ext/filters/client_channel/request_routing.cc \
47944793
src/core/ext/filters/client_channel/resolver.cc \
47954794
src/core/ext/filters/client_channel/resolver_registry.cc \
47964795
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4796+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
47974797
src/core/ext/filters/client_channel/retry_throttle.cc \
47984798
src/core/ext/filters/client_channel/server_address.cc \
47994799
src/core/ext/filters/client_channel/subchannel.cc \
@@ -5100,10 +5100,10 @@ LIBGRPC_UNSECURE_SRC = \
51005100
src/core/ext/filters/client_channel/parse_address.cc \
51015101
src/core/ext/filters/client_channel/proxy_mapper.cc \
51025102
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5103-
src/core/ext/filters/client_channel/request_routing.cc \
51045103
src/core/ext/filters/client_channel/resolver.cc \
51055104
src/core/ext/filters/client_channel/resolver_registry.cc \
51065105
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
5106+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
51075107
src/core/ext/filters/client_channel/retry_throttle.cc \
51085108
src/core/ext/filters/client_channel/server_address.cc \
51095109
src/core/ext/filters/client_channel/subchannel.cc \
@@ -5934,10 +5934,10 @@ LIBGRPC++_CRONET_SRC = \
59345934
src/core/ext/filters/client_channel/parse_address.cc \
59355935
src/core/ext/filters/client_channel/proxy_mapper.cc \
59365936
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5937-
src/core/ext/filters/client_channel/request_routing.cc \
59385937
src/core/ext/filters/client_channel/resolver.cc \
59395938
src/core/ext/filters/client_channel/resolver_registry.cc \
59405939
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
5940+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
59415941
src/core/ext/filters/client_channel/retry_throttle.cc \
59425942
src/core/ext/filters/client_channel/server_address.cc \
59435943
src/core/ext/filters/client_channel/subchannel.cc \

‎build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -587,11 +587,11 @@ filegroups:
587587
- src/core/ext/filters/client_channel/parse_address.h
588588
- src/core/ext/filters/client_channel/proxy_mapper.h
589589
- src/core/ext/filters/client_channel/proxy_mapper_registry.h
590-
- src/core/ext/filters/client_channel/request_routing.h
591590
- src/core/ext/filters/client_channel/resolver.h
592591
- src/core/ext/filters/client_channel/resolver_factory.h
593592
- src/core/ext/filters/client_channel/resolver_registry.h
594593
- src/core/ext/filters/client_channel/resolver_result_parsing.h
594+
- src/core/ext/filters/client_channel/resolving_lb_policy.h
595595
- src/core/ext/filters/client_channel/retry_throttle.h
596596
- src/core/ext/filters/client_channel/server_address.h
597597
- src/core/ext/filters/client_channel/subchannel.h
@@ -614,10 +614,10 @@ filegroups:
614614
- src/core/ext/filters/client_channel/parse_address.cc
615615
- src/core/ext/filters/client_channel/proxy_mapper.cc
616616
- src/core/ext/filters/client_channel/proxy_mapper_registry.cc
617-
- src/core/ext/filters/client_channel/request_routing.cc
618617
- src/core/ext/filters/client_channel/resolver.cc
619618
- src/core/ext/filters/client_channel/resolver_registry.cc
620619
- src/core/ext/filters/client_channel/resolver_result_parsing.cc
620+
- src/core/ext/filters/client_channel/resolving_lb_policy.cc
621621
- src/core/ext/filters/client_channel/retry_throttle.cc
622622
- src/core/ext/filters/client_channel/server_address.cc
623623
- src/core/ext/filters/client_channel/subchannel.cc

‎config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,10 @@ if test "$PHP_GRPC" != "no"; then
355355
src/core/ext/filters/client_channel/parse_address.cc \
356356
src/core/ext/filters/client_channel/proxy_mapper.cc \
357357
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
358-
src/core/ext/filters/client_channel/request_routing.cc \
359358
src/core/ext/filters/client_channel/resolver.cc \
360359
src/core/ext/filters/client_channel/resolver_registry.cc \
361360
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
361+
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
362362
src/core/ext/filters/client_channel/retry_throttle.cc \
363363
src/core/ext/filters/client_channel/server_address.cc \
364364
src/core/ext/filters/client_channel/subchannel.cc \

‎config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ if (PHP_GRPC != "no") {
330330
"src\\core\\ext\\filters\\client_channel\\parse_address.cc " +
331331
"src\\core\\ext\\filters\\client_channel\\proxy_mapper.cc " +
332332
"src\\core\\ext\\filters\\client_channel\\proxy_mapper_registry.cc " +
333-
"src\\core\\ext\\filters\\client_channel\\request_routing.cc " +
334333
"src\\core\\ext\\filters\\client_channel\\resolver.cc " +
335334
"src\\core\\ext\\filters\\client_channel\\resolver_registry.cc " +
336335
"src\\core\\ext\\filters\\client_channel\\resolver_result_parsing.cc " +
336+
"src\\core\\ext\\filters\\client_channel\\resolving_lb_policy.cc " +
337337
"src\\core\\ext\\filters\\client_channel\\retry_throttle.cc " +
338338
"src\\core\\ext\\filters\\client_channel\\server_address.cc " +
339339
"src\\core\\ext\\filters\\client_channel\\subchannel.cc " +

‎gRPC-C++.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,11 +360,11 @@ Pod::Spec.new do |s|
360360
'src/core/ext/filters/client_channel/parse_address.h',
361361
'src/core/ext/filters/client_channel/proxy_mapper.h',
362362
'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
363-
'src/core/ext/filters/client_channel/request_routing.h',
364363
'src/core/ext/filters/client_channel/resolver.h',
365364
'src/core/ext/filters/client_channel/resolver_factory.h',
366365
'src/core/ext/filters/client_channel/resolver_registry.h',
367366
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
367+
'src/core/ext/filters/client_channel/resolving_lb_policy.h',
368368
'src/core/ext/filters/client_channel/retry_throttle.h',
369369
'src/core/ext/filters/client_channel/server_address.h',
370370
'src/core/ext/filters/client_channel/subchannel.h',

‎gRPC-Core.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,11 @@ Pod::Spec.new do |s|
354354
'src/core/ext/filters/client_channel/parse_address.h',
355355
'src/core/ext/filters/client_channel/proxy_mapper.h',
356356
'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
357-
'src/core/ext/filters/client_channel/request_routing.h',
358357
'src/core/ext/filters/client_channel/resolver.h',
359358
'src/core/ext/filters/client_channel/resolver_factory.h',
360359
'src/core/ext/filters/client_channel/resolver_registry.h',
361360
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
361+
'src/core/ext/filters/client_channel/resolving_lb_policy.h',
362362
'src/core/ext/filters/client_channel/retry_throttle.h',
363363
'src/core/ext/filters/client_channel/server_address.h',
364364
'src/core/ext/filters/client_channel/subchannel.h',
@@ -801,10 +801,10 @@ Pod::Spec.new do |s|
801801
'src/core/ext/filters/client_channel/parse_address.cc',
802802
'src/core/ext/filters/client_channel/proxy_mapper.cc',
803803
'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
804-
'src/core/ext/filters/client_channel/request_routing.cc',
805804
'src/core/ext/filters/client_channel/resolver.cc',
806805
'src/core/ext/filters/client_channel/resolver_registry.cc',
807806
'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
807+
'src/core/ext/filters/client_channel/resolving_lb_policy.cc',
808808
'src/core/ext/filters/client_channel/retry_throttle.cc',
809809
'src/core/ext/filters/client_channel/server_address.cc',
810810
'src/core/ext/filters/client_channel/subchannel.cc',
@@ -984,11 +984,11 @@ Pod::Spec.new do |s|
984984
'src/core/ext/filters/client_channel/parse_address.h',
985985
'src/core/ext/filters/client_channel/proxy_mapper.h',
986986
'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
987-
'src/core/ext/filters/client_channel/request_routing.h',
988987
'src/core/ext/filters/client_channel/resolver.h',
989988
'src/core/ext/filters/client_channel/resolver_factory.h',
990989
'src/core/ext/filters/client_channel/resolver_registry.h',
991990
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
991+
'src/core/ext/filters/client_channel/resolving_lb_policy.h',
992992
'src/core/ext/filters/client_channel/retry_throttle.h',
993993
'src/core/ext/filters/client_channel/server_address.h',
994994
'src/core/ext/filters/client_channel/subchannel.h',

‎grpc.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,11 @@ Gem::Specification.new do |s|
288288
s.files += %w( src/core/ext/filters/client_channel/parse_address.h )
289289
s.files += %w( src/core/ext/filters/client_channel/proxy_mapper.h )
290290
s.files += %w( src/core/ext/filters/client_channel/proxy_mapper_registry.h )
291-
s.files += %w( src/core/ext/filters/client_channel/request_routing.h )
292291
s.files += %w( src/core/ext/filters/client_channel/resolver.h )
293292
s.files += %w( src/core/ext/filters/client_channel/resolver_factory.h )
294293
s.files += %w( src/core/ext/filters/client_channel/resolver_registry.h )
295294
s.files += %w( src/core/ext/filters/client_channel/resolver_result_parsing.h )
295+
s.files += %w( src/core/ext/filters/client_channel/resolving_lb_policy.h )
296296
s.files += %w( src/core/ext/filters/client_channel/retry_throttle.h )
297297
s.files += %w( src/core/ext/filters/client_channel/server_address.h )
298298
s.files += %w( src/core/ext/filters/client_channel/subchannel.h )
@@ -738,10 +738,10 @@ Gem::Specification.new do |s|
738738
s.files += %w( src/core/ext/filters/client_channel/parse_address.cc )
739739
s.files += %w( src/core/ext/filters/client_channel/proxy_mapper.cc )
740740
s.files += %w( src/core/ext/filters/client_channel/proxy_mapper_registry.cc )
741-
s.files += %w( src/core/ext/filters/client_channel/request_routing.cc )
742741
s.files += %w( src/core/ext/filters/client_channel/resolver.cc )
743742
s.files += %w( src/core/ext/filters/client_channel/resolver_registry.cc )
744743
s.files += %w( src/core/ext/filters/client_channel/resolver_result_parsing.cc )
744+
s.files += %w( src/core/ext/filters/client_channel/resolving_lb_policy.cc )
745745
s.files += %w( src/core/ext/filters/client_channel/retry_throttle.cc )
746746
s.files += %w( src/core/ext/filters/client_channel/server_address.cc )
747747
s.files += %w( src/core/ext/filters/client_channel/subchannel.cc )

0 commit comments

Comments
 (0)