From 148f59c15a366ecb59f6cac847ceb7e0b777c5ff Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Mon, 5 Feb 2024 10:03:15 -0800 Subject: [PATCH] [reorg] move LB policy code to src/core/load_balancing (#35786) This new directory combines code from the following locations: - src/core/ext/filters/client_channel/lb_policy - src/core/lib/load_balancing Closes #35786 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35786 from markdroth:client_channel_resolver_reorg 98554efb983c50c385009cd6a7df4b999932ec68 PiperOrigin-RevId: 604351832 --- BUILD | 14 +- CMakeLists.txt | 100 ++++----- Makefile | 104 ++++----- Package.swift | 102 ++++----- build_autogenerated.yaml | 208 +++++++++--------- config.m4 | 75 ++++--- config.w32 | 75 ++++--- gRPC-C++.podspec | 100 ++++----- gRPC-Core.podspec | 152 ++++++------- grpc.gemspec | 102 ++++----- grpc.gyp | 96 ++++---- package.xml | 102 ++++----- src/core/BUILD | 92 ++++---- .../backend_metrics/backend_metric_filter.cc | 2 +- .../filters/client_channel/backend_metric.h | 2 +- .../filters/client_channel/client_channel.cc | 6 +- .../filters/client_channel/client_channel.h | 4 +- .../client_channel/client_channel_internal.h | 2 +- .../client_channel_service_config.cc | 2 +- .../client_channel_service_config.h | 2 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 2 +- .../event_engine_client_channel_resolver.cc | 2 +- .../resolver/xds/xds_dependency_manager.cc | 2 +- .../resolver/xds/xds_resolver.cc | 2 +- .../subchannel_interface_internal.h | 2 +- src/core/ext/xds/xds_cluster.cc | 2 +- src/core/ext/xds/xds_cluster.h | 2 +- src/core/ext/xds/xds_lb_policy_registry.cc | 2 +- src/core/ext/xds/xds_route_config.cc | 2 +- src/core/lib/config/core_configuration.h | 2 +- .../google_default_credentials.cc | 4 +- .../credentials/xds/xds_credentials.cc | 2 +- .../fake/fake_security_connector.cc | 2 +- .../.clang-format | 0 .../address_filtering.cc | 2 +- .../address_filtering.h | 6 +- .../backend_metric_data.h | 6 +- .../child_policy_handler.cc | 8 +- .../child_policy_handler.h | 8 +- .../load_balancing/delegating_helper.h | 10 +- .../endpoint_list.cc | 10 +- .../endpoint_list.h | 10 +- .../grpclb/client_load_reporting_filter.cc | 4 +- .../grpclb/client_load_reporting_filter.h | 6 +- .../grpclb/grpclb.cc | 22 +- .../grpclb/grpclb.h | 6 +- .../grpclb/grpclb_balancer_addresses.cc | 2 +- .../grpclb/grpclb_balancer_addresses.h | 6 +- .../grpclb/grpclb_client_stats.cc | 2 +- .../grpclb/grpclb_client_stats.h | 6 +- .../grpclb/load_balancer_api.cc | 2 +- .../grpclb/load_balancer_api.h | 8 +- .../health_check_client.cc | 4 +- .../health_check_client.h | 8 +- .../health_check_client_internal.h | 8 +- .../{lib => }/load_balancing/lb_policy.cc | 2 +- src/core/{lib => }/load_balancing/lb_policy.h | 10 +- .../load_balancing/lb_policy_factory.h | 8 +- .../load_balancing/lb_policy_registry.cc | 4 +- .../load_balancing/lb_policy_registry.h | 10 +- .../oob_backend_metric.cc | 4 +- .../oob_backend_metric.h | 10 +- .../oob_backend_metric_internal.h | 10 +- .../outlier_detection/outlier_detection.cc | 16 +- .../outlier_detection/outlier_detection.h | 6 +- .../pick_first/pick_first.cc | 10 +- .../pick_first/pick_first.h | 6 +- .../priority/priority.cc | 12 +- .../ring_hash/ring_hash.cc | 12 +- .../ring_hash/ring_hash.h | 6 +- .../lb_policy => load_balancing}/rls/rls.cc | 10 +- .../round_robin/round_robin.cc | 10 +- .../load_balancing/subchannel_interface.h | 6 +- .../subchannel_list.h | 12 +- .../static_stride_scheduler.cc | 2 +- .../static_stride_scheduler.h | 6 +- .../weighted_round_robin.cc | 16 +- .../weighted_target/weighted_target.cc | 12 +- .../lb_policy => load_balancing}/xds/cds.cc | 14 +- .../xds/xds_channel_args.h | 6 +- .../xds/xds_cluster_impl.cc | 16 +- .../xds/xds_cluster_manager.cc | 10 +- .../xds/xds_override_host.cc | 14 +- .../xds/xds_override_host.h | 8 +- .../xds/xds_wrr_locality.cc | 10 +- src/cpp/server/backend_metric_recorder.cc | 2 +- src/cpp/server/backend_metric_recorder.h | 2 +- src/cpp/server/orca/orca_service.cc | 2 +- src/python/grpcio/grpc_core_dependencies.py | 52 ++--- .../make_grpcio_observability.py | 4 +- .../lb_policy/lb_policy_test_lib.h | 14 +- .../lb_policy/outlier_detection_test.cc | 4 +- .../lb_policy/pick_first_test.cc | 2 +- .../lb_policy/ring_hash_test.cc | 4 +- .../static_stride_scheduler_benchmark.cc | 2 +- .../lb_policy/static_stride_scheduler_test.cc | 2 +- .../lb_policy/weighted_round_robin_test.cc | 4 +- ...xds_override_host_lb_config_parser_test.cc | 2 +- .../lb_policy/xds_override_host_test.cc | 2 +- test/core/end2end/tests/retry_lb_drop.cc | 4 +- test/core/util/test_lb_policies.cc | 12 +- test/core/util/test_lb_policies.h | 2 +- .../xds/xds_cluster_resource_type_test.cc | 2 +- test/core/xds/xds_lb_policy_registry_test.cc | 4 +- ...channel_with_active_connect_stress_test.cc | 2 +- test/cpp/end2end/grpclb_end2end_test.cc | 4 +- .../xds/xds_cluster_type_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test.cc | 2 +- .../xds/xds_pick_first_end2end_test.cc | 2 +- .../end2end/xds/xds_ring_hash_end2end_test.cc | 2 +- test/cpp/grpclb/grpclb_api_test.cc | 2 +- test/cpp/interop/backend_metrics_lb_policy.cc | 4 +- test/cpp/interop/rpc_behavior_lb_policy.cc | 2 +- test/cpp/naming/resolver_component_test.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 102 ++++----- tools/doxygen/Doxyfile.core.internal | 102 ++++----- .../run_tests/sanity/core_banned_functions.py | 3 +- 117 files changed, 1072 insertions(+), 1073 deletions(-) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/.clang-format (100%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/address_filtering.cc (97%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/address_filtering.h (94%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/backend_metric_data.h (89%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/child_policy_handler.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/child_policy_handler.h (90%) rename src/core/{lib => }/load_balancing/delegating_helper.h (92%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/endpoint_list.cc (95%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/endpoint_list.h (95%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/client_load_reporting_filter.cc (94%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/client_load_reporting_filter.h (82%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/grpclb.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/grpclb.h (85%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/grpclb_balancer_addresses.cc (96%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/grpclb_balancer_addresses.h (80%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/grpclb_client_stats.cc (97%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/grpclb_client_stats.h (89%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/load_balancer_api.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/grpclb/load_balancer_api.h (86%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/health_check_client.cc (99%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/health_check_client.h (85%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/health_check_client_internal.h (95%) rename src/core/{lib => }/load_balancing/lb_policy.cc (98%) rename src/core/{lib => }/load_balancing/lb_policy.h (98%) rename src/core/{lib => }/load_balancing/lb_policy_factory.h (85%) rename src/core/{lib => }/load_balancing/lb_policy_registry.cc (97%) rename src/core/{lib => }/load_balancing/lb_policy_registry.h (89%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/oob_backend_metric.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/oob_backend_metric.h (81%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/oob_backend_metric_internal.h (90%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/outlier_detection/outlier_detection.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/outlier_detection/outlier_detection.h (91%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/pick_first/pick_first.cc (99%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/pick_first/pick_first.h (84%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/priority/priority.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/ring_hash/ring_hash.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/ring_hash/ring_hash.h (87%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/rls/rls.cc (99%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/round_robin/round_robin.cc (99%) rename src/core/{lib => }/load_balancing/subchannel_interface.h (96%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/subchannel_list.h (97%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/weighted_round_robin/static_stride_scheduler.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/weighted_round_robin/static_stride_scheduler.h (88%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/weighted_round_robin/weighted_round_robin.cc (99%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/weighted_target/weighted_target.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/cds.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/xds_channel_args.h (84%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/xds_cluster_impl.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/xds_cluster_manager.cc (98%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/xds_override_host.cc (99%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/xds_override_host.h (86%) rename src/core/{ext/filters/client_channel/lb_policy => load_balancing}/xds/xds_wrr_locality.cc (97%) diff --git a/BUILD b/BUILD index 6534f189793..3dd6e4f8d62 100644 --- a/BUILD +++ b/BUILD @@ -3014,8 +3014,6 @@ grpc_cc_library( "//src/core:ext/filters/client_channel/dynamic_filters.cc", "//src/core:ext/filters/client_channel/global_subchannel_pool.cc", "//src/core:ext/filters/client_channel/http_proxy_mapper.cc", - "//src/core:ext/filters/client_channel/lb_policy/child_policy_handler.cc", - "//src/core:ext/filters/client_channel/lb_policy/oob_backend_metric.cc", "//src/core:ext/filters/client_channel/local_subchannel_pool.cc", "//src/core:ext/filters/client_channel/retry_filter.cc", "//src/core:ext/filters/client_channel/retry_filter_legacy_call_data.cc", @@ -3025,6 +3023,8 @@ grpc_cc_library( "//src/core:ext/filters/client_channel/subchannel.cc", "//src/core:ext/filters/client_channel/subchannel_pool_interface.cc", "//src/core:ext/filters/client_channel/subchannel_stream_client.cc", + "//src/core:load_balancing/child_policy_handler.cc", + "//src/core:load_balancing/oob_backend_metric.cc", ], hdrs = [ "//src/core:ext/filters/client_channel/backend_metric.h", @@ -3039,9 +3039,6 @@ grpc_cc_library( "//src/core:ext/filters/client_channel/dynamic_filters.h", "//src/core:ext/filters/client_channel/global_subchannel_pool.h", "//src/core:ext/filters/client_channel/http_proxy_mapper.h", - "//src/core:ext/filters/client_channel/lb_policy/child_policy_handler.h", - "//src/core:ext/filters/client_channel/lb_policy/oob_backend_metric.h", - "//src/core:ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h", "//src/core:ext/filters/client_channel/local_subchannel_pool.h", "//src/core:ext/filters/client_channel/retry_filter.h", "//src/core:ext/filters/client_channel/retry_filter_legacy_call_data.h", @@ -3051,6 +3048,9 @@ grpc_cc_library( "//src/core:ext/filters/client_channel/subchannel_interface_internal.h", "//src/core:ext/filters/client_channel/subchannel_pool_interface.h", "//src/core:ext/filters/client_channel/subchannel_stream_client.h", + "//src/core:load_balancing/child_policy_handler.h", + "//src/core:load_balancing/oob_backend_metric.h", + "//src/core:load_balancing/oob_backend_metric_internal.h", ], external_deps = [ "absl/base:core_headers", @@ -3646,10 +3646,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_grpclb_balancer_addresses", srcs = [ - "//src/core:ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc", + "//src/core:load_balancing/grpclb/grpclb_balancer_addresses.cc", ], hdrs = [ - "//src/core:ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h", + "//src/core:load_balancing/grpclb/grpclb_balancer_addresses.h", ], language = "c++", visibility = ["@grpc:grpclb"], diff --git a/CMakeLists.txt b/CMakeLists.txt index acd54733f57..12959352064 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1794,30 +1794,6 @@ add_library(grpc src/core/ext/filters/client_channel/dynamic_filters.cc src/core/ext/filters/client_channel/global_subchannel_pool.cc src/core/ext/filters/client_channel/http_proxy_mapper.cc - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc - src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc - src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc - src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc src/core/ext/filters/client_channel/local_subchannel_pool.cc src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -2412,8 +2388,6 @@ add_library(grpc src/core/lib/json/json_reader.cc src/core/lib/json/json_util.cc src/core/lib/json/json_writer.cc - src/core/lib/load_balancing/lb_policy.cc - src/core/lib/load_balancing/lb_policy_registry.cc src/core/lib/matchers/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc @@ -2546,6 +2520,32 @@ add_library(grpc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc src/core/lib/uri/uri_parser.cc + src/core/load_balancing/address_filtering.cc + src/core/load_balancing/child_policy_handler.cc + src/core/load_balancing/endpoint_list.cc + src/core/load_balancing/grpclb/client_load_reporting_filter.cc + src/core/load_balancing/grpclb/grpclb.cc + src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc + src/core/load_balancing/grpclb/grpclb_client_stats.cc + src/core/load_balancing/grpclb/load_balancer_api.cc + src/core/load_balancing/health_check_client.cc + src/core/load_balancing/lb_policy.cc + src/core/load_balancing/lb_policy_registry.cc + src/core/load_balancing/oob_backend_metric.cc + src/core/load_balancing/outlier_detection/outlier_detection.cc + src/core/load_balancing/pick_first/pick_first.cc + src/core/load_balancing/priority/priority.cc + src/core/load_balancing/ring_hash/ring_hash.cc + src/core/load_balancing/rls/rls.cc + src/core/load_balancing/round_robin/round_robin.cc + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc + src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc + src/core/load_balancing/weighted_target/weighted_target.cc + src/core/load_balancing/xds/cds.cc + src/core/load_balancing/xds/xds_cluster_impl.cc + src/core/load_balancing/xds/xds_cluster_manager.cc + src/core/load_balancing/xds/xds_override_host.cc + src/core/load_balancing/xds/xds_wrr_locality.cc src/core/plugin_registry/grpc_plugin_registry.cc src/core/plugin_registry/grpc_plugin_registry_extra.cc src/core/tsi/alts/crypt/aes_gcm.cc @@ -2892,24 +2892,6 @@ add_library(grpc_unsecure src/core/ext/filters/client_channel/dynamic_filters.cc src/core/ext/filters/client_channel/global_subchannel_pool.cc src/core/ext/filters/client_channel/http_proxy_mapper.cc - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc src/core/ext/filters/client_channel/local_subchannel_pool.cc src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -3165,8 +3147,6 @@ add_library(grpc_unsecure src/core/lib/json/json_object_loader.cc src/core/lib/json/json_reader.cc src/core/lib/json/json_writer.cc - src/core/lib/load_balancing/lb_policy.cc - src/core/lib/load_balancing/lb_policy_registry.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/sleep.cc @@ -3264,6 +3244,26 @@ add_library(grpc_unsecure src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc src/core/lib/uri/uri_parser.cc + src/core/load_balancing/address_filtering.cc + src/core/load_balancing/child_policy_handler.cc + src/core/load_balancing/endpoint_list.cc + src/core/load_balancing/grpclb/client_load_reporting_filter.cc + src/core/load_balancing/grpclb/grpclb.cc + src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc + src/core/load_balancing/grpclb/grpclb_client_stats.cc + src/core/load_balancing/grpclb/load_balancer_api.cc + src/core/load_balancing/health_check_client.cc + src/core/load_balancing/lb_policy.cc + src/core/load_balancing/lb_policy_registry.cc + src/core/load_balancing/oob_backend_metric.cc + src/core/load_balancing/outlier_detection/outlier_detection.cc + src/core/load_balancing/pick_first/pick_first.cc + src/core/load_balancing/priority/priority.cc + src/core/load_balancing/rls/rls.cc + src/core/load_balancing/round_robin/round_robin.cc + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc + src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc + src/core/load_balancing/weighted_target/weighted_target.cc src/core/plugin_registry/grpc_plugin_registry.cc src/core/plugin_registry/grpc_plugin_registry_noextra.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc @@ -5255,8 +5255,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/wakeup_fd_posix.cc src/core/lib/json/json_reader.cc src/core/lib/json/json_writer.cc - src/core/lib/load_balancing/lb_policy.cc - src/core/lib/load_balancing/lb_policy_registry.cc src/core/lib/matchers/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc @@ -5352,6 +5350,8 @@ add_library(grpc_authorization_provider src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc src/core/lib/uri/uri_parser.cc + src/core/load_balancing/lb_policy.cc + src/core/load_balancing/lb_policy_registry.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc @@ -5804,7 +5804,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_executable(static_stride_scheduler_benchmark - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc test/core/client_channel/lb_policy/static_stride_scheduler_benchmark.cc ) if(WIN32 AND MSVC) @@ -27472,7 +27472,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(static_stride_scheduler_test - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc test/core/client_channel/lb_policy/static_stride_scheduler_test.cc ) if(WIN32 AND MSVC) diff --git a/Makefile b/Makefile index 2ae705ccef8..d72aa44ba90 100644 --- a/Makefile +++ b/Makefile @@ -976,30 +976,6 @@ LIBGRPC_SRC = \ src/core/ext/filters/client_channel/dynamic_filters.cc \ src/core/ext/filters/client_channel/global_subchannel_pool.cc \ src/core/ext/filters/client_channel/http_proxy_mapper.cc \ - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc \ - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc \ - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \ - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc \ - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc \ - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc \ - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \ - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \ - src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc \ - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc \ - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.cc \ src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \ src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \ @@ -1594,8 +1570,6 @@ LIBGRPC_SRC = \ src/core/lib/json/json_reader.cc \ src/core/lib/json/json_util.cc \ src/core/lib/json/json_writer.cc \ - src/core/lib/load_balancing/lb_policy.cc \ - src/core/lib/load_balancing/lb_policy_registry.cc \ src/core/lib/matchers/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ @@ -1728,6 +1702,32 @@ LIBGRPC_SRC = \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ src/core/lib/uri/uri_parser.cc \ + src/core/load_balancing/address_filtering.cc \ + src/core/load_balancing/child_policy_handler.cc \ + src/core/load_balancing/endpoint_list.cc \ + src/core/load_balancing/grpclb/client_load_reporting_filter.cc \ + src/core/load_balancing/grpclb/grpclb.cc \ + src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc \ + src/core/load_balancing/grpclb/grpclb_client_stats.cc \ + src/core/load_balancing/grpclb/load_balancer_api.cc \ + src/core/load_balancing/health_check_client.cc \ + src/core/load_balancing/lb_policy.cc \ + src/core/load_balancing/lb_policy_registry.cc \ + src/core/load_balancing/oob_backend_metric.cc \ + src/core/load_balancing/outlier_detection/outlier_detection.cc \ + src/core/load_balancing/pick_first/pick_first.cc \ + src/core/load_balancing/priority/priority.cc \ + src/core/load_balancing/ring_hash/ring_hash.cc \ + src/core/load_balancing/rls/rls.cc \ + src/core/load_balancing/round_robin/round_robin.cc \ + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc \ + src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc \ + src/core/load_balancing/weighted_target/weighted_target.cc \ + src/core/load_balancing/xds/cds.cc \ + src/core/load_balancing/xds/xds_cluster_impl.cc \ + src/core/load_balancing/xds/xds_cluster_manager.cc \ + src/core/load_balancing/xds/xds_override_host.cc \ + src/core/load_balancing/xds/xds_wrr_locality.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/plugin_registry/grpc_plugin_registry_extra.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ @@ -1908,24 +1908,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/filters/client_channel/dynamic_filters.cc \ src/core/ext/filters/client_channel/global_subchannel_pool.cc \ src/core/ext/filters/client_channel/http_proxy_mapper.cc \ - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc \ - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc \ - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \ - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc \ - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc \ - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc \ - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \ - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \ - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc \ - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.cc \ src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \ src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \ @@ -2181,8 +2163,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/json/json_object_loader.cc \ src/core/lib/json/json_reader.cc \ src/core/lib/json/json_writer.cc \ - src/core/lib/load_balancing/lb_policy.cc \ - src/core/lib/load_balancing/lb_policy_registry.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -2280,6 +2260,26 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ src/core/lib/uri/uri_parser.cc \ + src/core/load_balancing/address_filtering.cc \ + src/core/load_balancing/child_policy_handler.cc \ + src/core/load_balancing/endpoint_list.cc \ + src/core/load_balancing/grpclb/client_load_reporting_filter.cc \ + src/core/load_balancing/grpclb/grpclb.cc \ + src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc \ + src/core/load_balancing/grpclb/grpclb_client_stats.cc \ + src/core/load_balancing/grpclb/load_balancer_api.cc \ + src/core/load_balancing/health_check_client.cc \ + src/core/load_balancing/lb_policy.cc \ + src/core/load_balancing/lb_policy_registry.cc \ + src/core/load_balancing/oob_backend_metric.cc \ + src/core/load_balancing/outlier_detection/outlier_detection.cc \ + src/core/load_balancing/pick_first/pick_first.cc \ + src/core/load_balancing/priority/priority.cc \ + src/core/load_balancing/rls/rls.cc \ + src/core/load_balancing/round_robin/round_robin.cc \ + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc \ + src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc \ + src/core/load_balancing/weighted_target/weighted_target.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/plugin_registry/grpc_plugin_registry_noextra.cc \ src/core/tsi/alts/handshaker/transport_security_common_api.cc \ @@ -3422,12 +3422,6 @@ ifneq ($(OPENSSL_DEP),) # This is to ensure the embedded OpenSSL is built beforehand, properly # installing headers to their final destination on the drive. We need this # otherwise parallel compilation will fail if a source is compiled first. -src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc: $(OPENSSL_DEP) -src/core/ext/filters/client_channel/lb_policy/xds/cds.cc: $(OPENSSL_DEP) -src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc: $(OPENSSL_DEP) -src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc: $(OPENSSL_DEP) -src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc: $(OPENSSL_DEP) -src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc: $(OPENSSL_DEP) src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc: $(OPENSSL_DEP) src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc: $(OPENSSL_DEP) src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc: $(OPENSSL_DEP) @@ -3802,6 +3796,12 @@ src/core/lib/security/security_connector/local/local_security_connector.cc: $(OP src/core/lib/security/security_connector/ssl/ssl_security_connector.cc: $(OPENSSL_DEP) src/core/lib/security/security_connector/ssl_utils.cc: $(OPENSSL_DEP) src/core/lib/security/security_connector/tls/tls_security_connector.cc: $(OPENSSL_DEP) +src/core/load_balancing/ring_hash/ring_hash.cc: $(OPENSSL_DEP) +src/core/load_balancing/xds/cds.cc: $(OPENSSL_DEP) +src/core/load_balancing/xds/xds_cluster_impl.cc: $(OPENSSL_DEP) +src/core/load_balancing/xds/xds_cluster_manager.cc: $(OPENSSL_DEP) +src/core/load_balancing/xds/xds_override_host.cc: $(OPENSSL_DEP) +src/core/load_balancing/xds/xds_wrr_locality.cc: $(OPENSSL_DEP) src/core/plugin_registry/grpc_plugin_registry_extra.cc: $(OPENSSL_DEP) src/core/tsi/alts/crypt/aes_gcm.cc: $(OPENSSL_DEP) src/core/tsi/alts/crypt/gsec.cc: $(OPENSSL_DEP) diff --git a/Package.swift b/Package.swift index bab01bcf692..39976a00980 100644 --- a/Package.swift +++ b/Package.swift @@ -149,50 +149,6 @@ let package = Package( "src/core/ext/filters/client_channel/global_subchannel_pool.h", "src/core/ext/filters/client_channel/http_proxy_mapper.cc", "src/core/ext/filters/client_channel/http_proxy_mapper.h", - "src/core/ext/filters/client_channel/lb_policy/address_filtering.cc", - "src/core/ext/filters/client_channel/lb_policy/address_filtering.h", - "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h", - "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc", - "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h", - "src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc", - "src/core/ext/filters/client_channel/lb_policy/endpoint_list.h", - "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc", - "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h", - "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc", - "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h", - "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc", - "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h", - "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc", - "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h", - "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc", - "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h", - "src/core/ext/filters/client_channel/lb_policy/health_check_client.cc", - "src/core/ext/filters/client_channel/lb_policy/health_check_client.h", - "src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h", - "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc", - "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h", - "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h", - "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc", - "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h", - "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc", - "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h", - "src/core/ext/filters/client_channel/lb_policy/priority/priority.cc", - "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc", - "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h", - "src/core/ext/filters/client_channel/lb_policy/rls/rls.cc", - "src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc", - "src/core/ext/filters/client_channel/lb_policy/subchannel_list.h", - "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc", - "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h", - "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc", - "src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc", - "src/core/ext/filters/client_channel/lb_policy/xds/cds.cc", - "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h", - "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc", - "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc", - "src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc", - "src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h", - "src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc", "src/core/ext/filters/client_channel/local_subchannel_pool.cc", "src/core/ext/filters/client_channel/local_subchannel_pool.h", "src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc", @@ -1645,13 +1601,6 @@ let package = Package( "src/core/lib/json/json_util.h", "src/core/lib/json/json_writer.cc", "src/core/lib/json/json_writer.h", - "src/core/lib/load_balancing/delegating_helper.h", - "src/core/lib/load_balancing/lb_policy.cc", - "src/core/lib/load_balancing/lb_policy.h", - "src/core/lib/load_balancing/lb_policy_factory.h", - "src/core/lib/load_balancing/lb_policy_registry.cc", - "src/core/lib/load_balancing/lb_policy_registry.h", - "src/core/lib/load_balancing/subchannel_interface.h", "src/core/lib/matchers/matchers.cc", "src/core/lib/matchers/matchers.h", "src/core/lib/promise/activity.cc", @@ -1944,6 +1893,57 @@ let package = Package( "src/core/lib/transport/transport_op_string.cc", "src/core/lib/uri/uri_parser.cc", "src/core/lib/uri/uri_parser.h", + "src/core/load_balancing/address_filtering.cc", + "src/core/load_balancing/address_filtering.h", + "src/core/load_balancing/backend_metric_data.h", + "src/core/load_balancing/child_policy_handler.cc", + "src/core/load_balancing/child_policy_handler.h", + "src/core/load_balancing/delegating_helper.h", + "src/core/load_balancing/endpoint_list.cc", + "src/core/load_balancing/endpoint_list.h", + "src/core/load_balancing/grpclb/client_load_reporting_filter.cc", + "src/core/load_balancing/grpclb/client_load_reporting_filter.h", + "src/core/load_balancing/grpclb/grpclb.cc", + "src/core/load_balancing/grpclb/grpclb.h", + "src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc", + "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h", + "src/core/load_balancing/grpclb/grpclb_client_stats.cc", + "src/core/load_balancing/grpclb/grpclb_client_stats.h", + "src/core/load_balancing/grpclb/load_balancer_api.cc", + "src/core/load_balancing/grpclb/load_balancer_api.h", + "src/core/load_balancing/health_check_client.cc", + "src/core/load_balancing/health_check_client.h", + "src/core/load_balancing/health_check_client_internal.h", + "src/core/load_balancing/lb_policy.cc", + "src/core/load_balancing/lb_policy.h", + "src/core/load_balancing/lb_policy_factory.h", + "src/core/load_balancing/lb_policy_registry.cc", + "src/core/load_balancing/lb_policy_registry.h", + "src/core/load_balancing/oob_backend_metric.cc", + "src/core/load_balancing/oob_backend_metric.h", + "src/core/load_balancing/oob_backend_metric_internal.h", + "src/core/load_balancing/outlier_detection/outlier_detection.cc", + "src/core/load_balancing/outlier_detection/outlier_detection.h", + "src/core/load_balancing/pick_first/pick_first.cc", + "src/core/load_balancing/pick_first/pick_first.h", + "src/core/load_balancing/priority/priority.cc", + "src/core/load_balancing/ring_hash/ring_hash.cc", + "src/core/load_balancing/ring_hash/ring_hash.h", + "src/core/load_balancing/rls/rls.cc", + "src/core/load_balancing/round_robin/round_robin.cc", + "src/core/load_balancing/subchannel_interface.h", + "src/core/load_balancing/subchannel_list.h", + "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc", + "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h", + "src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc", + "src/core/load_balancing/weighted_target/weighted_target.cc", + "src/core/load_balancing/xds/cds.cc", + "src/core/load_balancing/xds/xds_channel_args.h", + "src/core/load_balancing/xds/xds_cluster_impl.cc", + "src/core/load_balancing/xds/xds_cluster_manager.cc", + "src/core/load_balancing/xds/xds_override_host.cc", + "src/core/load_balancing/xds/xds_override_host.h", + "src/core/load_balancing/xds/xds_wrr_locality.cc", "src/core/plugin_registry/grpc_plugin_registry.cc", "src/core/plugin_registry/grpc_plugin_registry_extra.cc", "src/core/tsi/alts/crypt/aes_gcm.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 05981fbb7c9..1964edf6d8a 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -234,26 +234,6 @@ libs: - src/core/ext/filters/client_channel/dynamic_filters.h - src/core/ext/filters/client_channel/global_subchannel_pool.h - src/core/ext/filters/client_channel/http_proxy_mapper.h - - src/core/ext/filters/client_channel/lb_policy/address_filtering.h - - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h - - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h - - src/core/ext/filters/client_channel/lb_policy/endpoint_list.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h - - src/core/ext/filters/client_channel/lb_policy/health_check_client.h - - src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h - - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h - - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h - - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h - - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h - - src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h - - src/core/ext/filters/client_channel/lb_policy/subchannel_list.h - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h - - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h - - src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h - src/core/ext/filters/client_channel/local_subchannel_pool.h - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -1041,11 +1021,6 @@ libs: - src/core/lib/json/json_reader.h - src/core/lib/json/json_util.h - src/core/lib/json/json_writer.h - - src/core/lib/load_balancing/delegating_helper.h - - src/core/lib/load_balancing/lb_policy.h - - src/core/lib/load_balancing/lb_policy_factory.h - - src/core/lib/load_balancing/lb_policy_registry.h - - src/core/lib/load_balancing/subchannel_interface.h - src/core/lib/matchers/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h @@ -1202,6 +1177,31 @@ libs: - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - src/core/lib/uri/uri_parser.h + - src/core/load_balancing/address_filtering.h + - src/core/load_balancing/backend_metric_data.h + - src/core/load_balancing/child_policy_handler.h + - src/core/load_balancing/delegating_helper.h + - src/core/load_balancing/endpoint_list.h + - src/core/load_balancing/grpclb/client_load_reporting_filter.h + - src/core/load_balancing/grpclb/grpclb.h + - src/core/load_balancing/grpclb/grpclb_balancer_addresses.h + - src/core/load_balancing/grpclb/grpclb_client_stats.h + - src/core/load_balancing/grpclb/load_balancer_api.h + - src/core/load_balancing/health_check_client.h + - src/core/load_balancing/health_check_client_internal.h + - src/core/load_balancing/lb_policy.h + - src/core/load_balancing/lb_policy_factory.h + - src/core/load_balancing/lb_policy_registry.h + - src/core/load_balancing/oob_backend_metric.h + - src/core/load_balancing/oob_backend_metric_internal.h + - src/core/load_balancing/outlier_detection/outlier_detection.h + - src/core/load_balancing/pick_first/pick_first.h + - src/core/load_balancing/ring_hash/ring_hash.h + - src/core/load_balancing/subchannel_interface.h + - src/core/load_balancing/subchannel_list.h + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h + - src/core/load_balancing/xds/xds_channel_args.h + - src/core/load_balancing/xds/xds_override_host.h - src/core/tsi/alts/crypt/gsec.h - src/core/tsi/alts/frame_protector/alts_counter.h - src/core/tsi/alts/frame_protector/alts_crypter.h @@ -1251,30 +1251,6 @@ libs: - src/core/ext/filters/client_channel/dynamic_filters.cc - src/core/ext/filters/client_channel/global_subchannel_pool.cc - src/core/ext/filters/client_channel/http_proxy_mapper.cc - - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc - - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc - - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc - - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc - - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc - - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc - - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc - - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc - - src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc - - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc - - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc - - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc - - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc - - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc - - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc - - src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc - - src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc - src/core/ext/filters/client_channel/local_subchannel_pool.cc - src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -1869,8 +1845,6 @@ libs: - src/core/lib/json/json_reader.cc - src/core/lib/json/json_util.cc - src/core/lib/json/json_writer.cc - - src/core/lib/load_balancing/lb_policy.cc - - src/core/lib/load_balancing/lb_policy_registry.cc - src/core/lib/matchers/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc @@ -2003,6 +1977,32 @@ libs: - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc + - src/core/load_balancing/address_filtering.cc + - src/core/load_balancing/child_policy_handler.cc + - src/core/load_balancing/endpoint_list.cc + - src/core/load_balancing/grpclb/client_load_reporting_filter.cc + - src/core/load_balancing/grpclb/grpclb.cc + - src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc + - src/core/load_balancing/grpclb/grpclb_client_stats.cc + - src/core/load_balancing/grpclb/load_balancer_api.cc + - src/core/load_balancing/health_check_client.cc + - src/core/load_balancing/lb_policy.cc + - src/core/load_balancing/lb_policy_registry.cc + - src/core/load_balancing/oob_backend_metric.cc + - src/core/load_balancing/outlier_detection/outlier_detection.cc + - src/core/load_balancing/pick_first/pick_first.cc + - src/core/load_balancing/priority/priority.cc + - src/core/load_balancing/ring_hash/ring_hash.cc + - src/core/load_balancing/rls/rls.cc + - src/core/load_balancing/round_robin/round_robin.cc + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc + - src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc + - src/core/load_balancing/weighted_target/weighted_target.cc + - src/core/load_balancing/xds/cds.cc + - src/core/load_balancing/xds/xds_cluster_impl.cc + - src/core/load_balancing/xds/xds_cluster_manager.cc + - src/core/load_balancing/xds/xds_override_host.cc + - src/core/load_balancing/xds/xds_wrr_locality.cc - src/core/plugin_registry/grpc_plugin_registry.cc - src/core/plugin_registry/grpc_plugin_registry_extra.cc - src/core/tsi/alts/crypt/aes_gcm.cc @@ -2213,23 +2213,6 @@ libs: - src/core/ext/filters/client_channel/dynamic_filters.h - src/core/ext/filters/client_channel/global_subchannel_pool.h - src/core/ext/filters/client_channel/http_proxy_mapper.h - - src/core/ext/filters/client_channel/lb_policy/address_filtering.h - - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h - - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h - - src/core/ext/filters/client_channel/lb_policy/endpoint_list.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h - - src/core/ext/filters/client_channel/lb_policy/health_check_client.h - - src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h - - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h - - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h - - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h - - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h - - src/core/ext/filters/client_channel/lb_policy/subchannel_list.h - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h - src/core/ext/filters/client_channel/local_subchannel_pool.h - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -2528,11 +2511,6 @@ libs: - src/core/lib/json/json_object_loader.h - src/core/lib/json/json_reader.h - src/core/lib/json/json_writer.h - - src/core/lib/load_balancing/delegating_helper.h - - src/core/lib/load_balancing/lb_policy.h - - src/core/lib/load_balancing/lb_policy_factory.h - - src/core/lib/load_balancing/lb_policy_registry.h - - src/core/lib/load_balancing/subchannel_interface.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -2657,6 +2635,28 @@ libs: - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - src/core/lib/uri/uri_parser.h + - src/core/load_balancing/address_filtering.h + - src/core/load_balancing/backend_metric_data.h + - src/core/load_balancing/child_policy_handler.h + - src/core/load_balancing/delegating_helper.h + - src/core/load_balancing/endpoint_list.h + - src/core/load_balancing/grpclb/client_load_reporting_filter.h + - src/core/load_balancing/grpclb/grpclb.h + - src/core/load_balancing/grpclb/grpclb_balancer_addresses.h + - src/core/load_balancing/grpclb/grpclb_client_stats.h + - src/core/load_balancing/grpclb/load_balancer_api.h + - src/core/load_balancing/health_check_client.h + - src/core/load_balancing/health_check_client_internal.h + - src/core/load_balancing/lb_policy.h + - src/core/load_balancing/lb_policy_factory.h + - src/core/load_balancing/lb_policy_registry.h + - src/core/load_balancing/oob_backend_metric.h + - src/core/load_balancing/oob_backend_metric_internal.h + - src/core/load_balancing/outlier_detection/outlier_detection.h + - src/core/load_balancing/pick_first/pick_first.h + - src/core/load_balancing/subchannel_interface.h + - src/core/load_balancing/subchannel_list.h + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/tsi/fake_transport_security.h - src/core/tsi/local_transport_security.h @@ -2702,24 +2702,6 @@ libs: - src/core/ext/filters/client_channel/dynamic_filters.cc - src/core/ext/filters/client_channel/global_subchannel_pool.cc - src/core/ext/filters/client_channel/http_proxy_mapper.cc - - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc - - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc - - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc - - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc - - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc - - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc - - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc - - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc - - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc - - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc - - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc - - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc - src/core/ext/filters/client_channel/local_subchannel_pool.cc - src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -2975,8 +2957,6 @@ libs: - src/core/lib/json/json_object_loader.cc - src/core/lib/json/json_reader.cc - src/core/lib/json/json_writer.cc - - src/core/lib/load_balancing/lb_policy.cc - - src/core/lib/load_balancing/lb_policy_registry.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/sleep.cc @@ -3074,6 +3054,26 @@ libs: - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc + - src/core/load_balancing/address_filtering.cc + - src/core/load_balancing/child_policy_handler.cc + - src/core/load_balancing/endpoint_list.cc + - src/core/load_balancing/grpclb/client_load_reporting_filter.cc + - src/core/load_balancing/grpclb/grpclb.cc + - src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc + - src/core/load_balancing/grpclb/grpclb_client_stats.cc + - src/core/load_balancing/grpclb/load_balancer_api.cc + - src/core/load_balancing/health_check_client.cc + - src/core/load_balancing/lb_policy.cc + - src/core/load_balancing/lb_policy_registry.cc + - src/core/load_balancing/oob_backend_metric.cc + - src/core/load_balancing/outlier_detection/outlier_detection.cc + - src/core/load_balancing/pick_first/pick_first.cc + - src/core/load_balancing/priority/priority.cc + - src/core/load_balancing/rls/rls.cc + - src/core/load_balancing/round_robin/round_robin.cc + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc + - src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc + - src/core/load_balancing/weighted_target/weighted_target.cc - src/core/plugin_registry/grpc_plugin_registry.cc - src/core/plugin_registry/grpc_plugin_registry_noextra.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc @@ -4370,7 +4370,6 @@ libs: - include/grpc/support/time.h - include/grpc/support/workaround_list.h headers: - - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h - src/core/ext/upb-gen/google/protobuf/any.upb.h - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h @@ -4575,10 +4574,6 @@ libs: - src/core/lib/json/json_args.h - src/core/lib/json/json_reader.h - src/core/lib/json/json_writer.h - - src/core/lib/load_balancing/lb_policy.h - - src/core/lib/load_balancing/lb_policy_factory.h - - src/core/lib/load_balancing/lb_policy_registry.h - - src/core/lib/load_balancing/subchannel_interface.h - src/core/lib/matchers/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h @@ -4702,6 +4697,11 @@ libs: - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - src/core/lib/uri/uri_parser.h + - src/core/load_balancing/backend_metric_data.h + - src/core/load_balancing/lb_policy.h + - src/core/load_balancing/lb_policy_factory.h + - src/core/load_balancing/lb_policy_registry.h + - src/core/load_balancing/subchannel_interface.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h @@ -4899,8 +4899,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/json/json_reader.cc - src/core/lib/json/json_writer.cc - - src/core/lib/load_balancing/lb_policy.cc - - src/core/lib/load_balancing/lb_policy_registry.cc - src/core/lib/matchers/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc @@ -4996,6 +4994,8 @@ libs: - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc + - src/core/load_balancing/lb_policy.cc + - src/core/load_balancing/lb_policy_registry.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc @@ -5146,9 +5146,9 @@ targets: build: test language: c headers: - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h src: - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc - test/core/client_channel/lb_policy/static_stride_scheduler_benchmark.cc deps: - absl/algorithm:container @@ -15988,9 +15988,9 @@ targets: build: test language: c++ headers: - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h src: - - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc + - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc - test/core/client_channel/lb_policy/static_stride_scheduler_test.cc deps: - gtest diff --git a/config.m4 b/config.m4 index 35683cf5ede..30bbb2dcf5c 100644 --- a/config.m4 +++ b/config.m4 @@ -58,30 +58,6 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/filters/client_channel/dynamic_filters.cc \ src/core/ext/filters/client_channel/global_subchannel_pool.cc \ src/core/ext/filters/client_channel/http_proxy_mapper.cc \ - src/core/ext/filters/client_channel/lb_policy/address_filtering.cc \ - src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc \ - src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \ - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \ - src/core/ext/filters/client_channel/lb_policy/health_check_client.cc \ - src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc \ - src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc \ - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \ - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \ - src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc \ - src/core/ext/filters/client_channel/lb_policy/rls/rls.cc \ - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc \ - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc \ - src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.cc \ src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \ src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \ @@ -722,8 +698,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/json/json_reader.cc \ src/core/lib/json/json_util.cc \ src/core/lib/json/json_writer.cc \ - src/core/lib/load_balancing/lb_policy.cc \ - src/core/lib/load_balancing/lb_policy_registry.cc \ src/core/lib/matchers/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ @@ -856,6 +830,32 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ src/core/lib/uri/uri_parser.cc \ + src/core/load_balancing/address_filtering.cc \ + src/core/load_balancing/child_policy_handler.cc \ + src/core/load_balancing/endpoint_list.cc \ + src/core/load_balancing/grpclb/client_load_reporting_filter.cc \ + src/core/load_balancing/grpclb/grpclb.cc \ + src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc \ + src/core/load_balancing/grpclb/grpclb_client_stats.cc \ + src/core/load_balancing/grpclb/load_balancer_api.cc \ + src/core/load_balancing/health_check_client.cc \ + src/core/load_balancing/lb_policy.cc \ + src/core/load_balancing/lb_policy_registry.cc \ + src/core/load_balancing/oob_backend_metric.cc \ + src/core/load_balancing/outlier_detection/outlier_detection.cc \ + src/core/load_balancing/pick_first/pick_first.cc \ + src/core/load_balancing/priority/priority.cc \ + src/core/load_balancing/ring_hash/ring_hash.cc \ + src/core/load_balancing/rls/rls.cc \ + src/core/load_balancing/round_robin/round_robin.cc \ + src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc \ + src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc \ + src/core/load_balancing/weighted_target/weighted_target.cc \ + src/core/load_balancing/xds/cds.cc \ + src/core/load_balancing/xds/xds_cluster_impl.cc \ + src/core/load_balancing/xds/xds_cluster_manager.cc \ + src/core/load_balancing/xds/xds_override_host.cc \ + src/core/load_balancing/xds/xds_wrr_locality.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/plugin_registry/grpc_plugin_registry_extra.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ @@ -1374,17 +1374,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/grpclb) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/outlier_detection) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/pick_first) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/priority) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/ring_hash) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/rls) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/round_robin) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/weighted_target) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/xds) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/binder) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/dns) @@ -1544,7 +1533,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/load_balancing) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resolver) @@ -1581,6 +1569,17 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/uri) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/grpclb) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/outlier_detection) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/pick_first) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/priority) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/ring_hash) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/rls) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/round_robin) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/weighted_round_robin) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/weighted_target) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/xds) PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt) diff --git a/config.w32 b/config.w32 index b34f443eeea..b316bb9bbcb 100644 --- a/config.w32 +++ b/config.w32 @@ -23,30 +23,6 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\filters\\client_channel\\dynamic_filters.cc " + "src\\core\\ext\\filters\\client_channel\\global_subchannel_pool.cc " + "src\\core\\ext\\filters\\client_channel\\http_proxy_mapper.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\address_filtering.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\child_policy_handler.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\endpoint_list.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\client_load_reporting_filter.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_balancer_addresses.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_client_stats.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\load_balancer_api.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\health_check_client.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\oob_backend_metric.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\outlier_detection\\outlier_detection.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\pick_first\\pick_first.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\priority\\priority.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\ring_hash\\ring_hash.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\rls\\rls.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\round_robin\\round_robin.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\weighted_round_robin\\static_stride_scheduler.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\weighted_round_robin\\weighted_round_robin.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\weighted_target\\weighted_target.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\xds\\cds.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\xds\\xds_cluster_impl.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\xds\\xds_cluster_manager.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\xds\\xds_override_host.cc " + - "src\\core\\ext\\filters\\client_channel\\lb_policy\\xds\\xds_wrr_locality.cc " + "src\\core\\ext\\filters\\client_channel\\local_subchannel_pool.cc " + "src\\core\\ext\\filters\\client_channel\\resolver\\binder\\binder_resolver.cc " + "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " + @@ -687,8 +663,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\json\\json_reader.cc " + "src\\core\\lib\\json\\json_util.cc " + "src\\core\\lib\\json\\json_writer.cc " + - "src\\core\\lib\\load_balancing\\lb_policy.cc " + - "src\\core\\lib\\load_balancing\\lb_policy_registry.cc " + "src\\core\\lib\\matchers\\matchers.cc " + "src\\core\\lib\\promise\\activity.cc " + "src\\core\\lib\\promise\\party.cc " + @@ -821,6 +795,32 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\transport.cc " + "src\\core\\lib\\transport\\transport_op_string.cc " + "src\\core\\lib\\uri\\uri_parser.cc " + + "src\\core\\load_balancing\\address_filtering.cc " + + "src\\core\\load_balancing\\child_policy_handler.cc " + + "src\\core\\load_balancing\\endpoint_list.cc " + + "src\\core\\load_balancing\\grpclb\\client_load_reporting_filter.cc " + + "src\\core\\load_balancing\\grpclb\\grpclb.cc " + + "src\\core\\load_balancing\\grpclb\\grpclb_balancer_addresses.cc " + + "src\\core\\load_balancing\\grpclb\\grpclb_client_stats.cc " + + "src\\core\\load_balancing\\grpclb\\load_balancer_api.cc " + + "src\\core\\load_balancing\\health_check_client.cc " + + "src\\core\\load_balancing\\lb_policy.cc " + + "src\\core\\load_balancing\\lb_policy_registry.cc " + + "src\\core\\load_balancing\\oob_backend_metric.cc " + + "src\\core\\load_balancing\\outlier_detection\\outlier_detection.cc " + + "src\\core\\load_balancing\\pick_first\\pick_first.cc " + + "src\\core\\load_balancing\\priority\\priority.cc " + + "src\\core\\load_balancing\\ring_hash\\ring_hash.cc " + + "src\\core\\load_balancing\\rls\\rls.cc " + + "src\\core\\load_balancing\\round_robin\\round_robin.cc " + + "src\\core\\load_balancing\\weighted_round_robin\\static_stride_scheduler.cc " + + "src\\core\\load_balancing\\weighted_round_robin\\weighted_round_robin.cc " + + "src\\core\\load_balancing\\weighted_target\\weighted_target.cc " + + "src\\core\\load_balancing\\xds\\cds.cc " + + "src\\core\\load_balancing\\xds\\xds_cluster_impl.cc " + + "src\\core\\load_balancing\\xds\\xds_cluster_manager.cc " + + "src\\core\\load_balancing\\xds\\xds_override_host.cc " + + "src\\core\\load_balancing\\xds\\xds_wrr_locality.cc " + "src\\core\\plugin_registry\\grpc_plugin_registry.cc " + "src\\core\\plugin_registry\\grpc_plugin_registry_extra.cc " + "src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " + @@ -1368,17 +1368,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\census"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\channel_idle"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\outlier_detection"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\pick_first"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\priority"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\ring_hash"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\rls"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\round_robin"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\weighted_round_robin"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\weighted_target"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\xds"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\binder"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\dns"); @@ -1681,7 +1670,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\load_balancing"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resolver"); @@ -1719,6 +1707,17 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\surface"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\transport"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\uri"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\grpclb"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\outlier_detection"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\pick_first"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\priority"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\ring_hash"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\rls"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\round_robin"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\weighted_round_robin"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\weighted_target"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\xds"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\plugin_registry"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 2550b7b9ac1..1b5a250be1b 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -274,26 +274,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/dynamic_filters.h', 'src/core/ext/filters/client_channel/global_subchannel_pool.h', 'src/core/ext/filters/client_channel/http_proxy_mapper.h', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.h', - 'src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h', - 'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h', 'src/core/ext/filters/client_channel/local_subchannel_pool.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h', @@ -1145,11 +1125,6 @@ Pod::Spec.new do |s| 'src/core/lib/json/json_reader.h', 'src/core/lib/json/json_util.h', 'src/core/lib/json/json_writer.h', - 'src/core/lib/load_balancing/delegating_helper.h', - 'src/core/lib/load_balancing/lb_policy.h', - 'src/core/lib/load_balancing/lb_policy_factory.h', - 'src/core/lib/load_balancing/lb_policy_registry.h', - 'src/core/lib/load_balancing/subchannel_interface.h', 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -1306,6 +1281,31 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/uri/uri_parser.h', + 'src/core/load_balancing/address_filtering.h', + 'src/core/load_balancing/backend_metric_data.h', + 'src/core/load_balancing/child_policy_handler.h', + 'src/core/load_balancing/delegating_helper.h', + 'src/core/load_balancing/endpoint_list.h', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.h', + 'src/core/load_balancing/grpclb/grpclb.h', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.h', + 'src/core/load_balancing/grpclb/grpclb_client_stats.h', + 'src/core/load_balancing/grpclb/load_balancer_api.h', + 'src/core/load_balancing/health_check_client.h', + 'src/core/load_balancing/health_check_client_internal.h', + 'src/core/load_balancing/lb_policy.h', + 'src/core/load_balancing/lb_policy_factory.h', + 'src/core/load_balancing/lb_policy_registry.h', + 'src/core/load_balancing/oob_backend_metric.h', + 'src/core/load_balancing/oob_backend_metric_internal.h', + 'src/core/load_balancing/outlier_detection/outlier_detection.h', + 'src/core/load_balancing/pick_first/pick_first.h', + 'src/core/load_balancing/ring_hash/ring_hash.h', + 'src/core/load_balancing/subchannel_interface.h', + 'src/core/load_balancing/subchannel_list.h', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h', + 'src/core/load_balancing/xds/xds_channel_args.h', + 'src/core/load_balancing/xds/xds_override_host.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', @@ -1549,26 +1549,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/dynamic_filters.h', 'src/core/ext/filters/client_channel/global_subchannel_pool.h', 'src/core/ext/filters/client_channel/http_proxy_mapper.h', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.h', - 'src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h', - 'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h', 'src/core/ext/filters/client_channel/local_subchannel_pool.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h', @@ -2402,11 +2382,6 @@ Pod::Spec.new do |s| 'src/core/lib/json/json_reader.h', 'src/core/lib/json/json_util.h', 'src/core/lib/json/json_writer.h', - 'src/core/lib/load_balancing/delegating_helper.h', - 'src/core/lib/load_balancing/lb_policy.h', - 'src/core/lib/load_balancing/lb_policy_factory.h', - 'src/core/lib/load_balancing/lb_policy_registry.h', - 'src/core/lib/load_balancing/subchannel_interface.h', 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -2563,6 +2538,31 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/uri/uri_parser.h', + 'src/core/load_balancing/address_filtering.h', + 'src/core/load_balancing/backend_metric_data.h', + 'src/core/load_balancing/child_policy_handler.h', + 'src/core/load_balancing/delegating_helper.h', + 'src/core/load_balancing/endpoint_list.h', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.h', + 'src/core/load_balancing/grpclb/grpclb.h', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.h', + 'src/core/load_balancing/grpclb/grpclb_client_stats.h', + 'src/core/load_balancing/grpclb/load_balancer_api.h', + 'src/core/load_balancing/health_check_client.h', + 'src/core/load_balancing/health_check_client_internal.h', + 'src/core/load_balancing/lb_policy.h', + 'src/core/load_balancing/lb_policy_factory.h', + 'src/core/load_balancing/lb_policy_registry.h', + 'src/core/load_balancing/oob_backend_metric.h', + 'src/core/load_balancing/oob_backend_metric_internal.h', + 'src/core/load_balancing/outlier_detection/outlier_detection.h', + 'src/core/load_balancing/pick_first/pick_first.h', + 'src/core/load_balancing/ring_hash/ring_hash.h', + 'src/core/load_balancing/subchannel_interface.h', + 'src/core/load_balancing/subchannel_list.h', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h', + 'src/core/load_balancing/xds/xds_channel_args.h', + 'src/core/load_balancing/xds/xds_override_host.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 63bb150a140..19436806e23 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -262,50 +262,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/global_subchannel_pool.h', 'src/core/ext/filters/client_channel/http_proxy_mapper.cc', 'src/core/ext/filters/client_channel/http_proxy_mapper.h', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.cc', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.h', - 'src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.cc', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h', - 'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h', - 'src/core/ext/filters/client_channel/lb_policy/rls/rls.cc', - 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/cds.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc', 'src/core/ext/filters/client_channel/local_subchannel_pool.cc', 'src/core/ext/filters/client_channel/local_subchannel_pool.h', 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc', @@ -1758,13 +1714,6 @@ Pod::Spec.new do |s| 'src/core/lib/json/json_util.h', 'src/core/lib/json/json_writer.cc', 'src/core/lib/json/json_writer.h', - 'src/core/lib/load_balancing/delegating_helper.h', - 'src/core/lib/load_balancing/lb_policy.cc', - 'src/core/lib/load_balancing/lb_policy.h', - 'src/core/lib/load_balancing/lb_policy_factory.h', - 'src/core/lib/load_balancing/lb_policy_registry.cc', - 'src/core/lib/load_balancing/lb_policy_registry.h', - 'src/core/lib/load_balancing/subchannel_interface.h', 'src/core/lib/matchers/matchers.cc', 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.cc', @@ -2053,6 +2002,57 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport_op_string.cc', 'src/core/lib/uri/uri_parser.cc', 'src/core/lib/uri/uri_parser.h', + 'src/core/load_balancing/address_filtering.cc', + 'src/core/load_balancing/address_filtering.h', + 'src/core/load_balancing/backend_metric_data.h', + 'src/core/load_balancing/child_policy_handler.cc', + 'src/core/load_balancing/child_policy_handler.h', + 'src/core/load_balancing/delegating_helper.h', + 'src/core/load_balancing/endpoint_list.cc', + 'src/core/load_balancing/endpoint_list.h', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.cc', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.h', + 'src/core/load_balancing/grpclb/grpclb.cc', + 'src/core/load_balancing/grpclb/grpclb.h', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.h', + 'src/core/load_balancing/grpclb/grpclb_client_stats.cc', + 'src/core/load_balancing/grpclb/grpclb_client_stats.h', + 'src/core/load_balancing/grpclb/load_balancer_api.cc', + 'src/core/load_balancing/grpclb/load_balancer_api.h', + 'src/core/load_balancing/health_check_client.cc', + 'src/core/load_balancing/health_check_client.h', + 'src/core/load_balancing/health_check_client_internal.h', + 'src/core/load_balancing/lb_policy.cc', + 'src/core/load_balancing/lb_policy.h', + 'src/core/load_balancing/lb_policy_factory.h', + 'src/core/load_balancing/lb_policy_registry.cc', + 'src/core/load_balancing/lb_policy_registry.h', + 'src/core/load_balancing/oob_backend_metric.cc', + 'src/core/load_balancing/oob_backend_metric.h', + 'src/core/load_balancing/oob_backend_metric_internal.h', + 'src/core/load_balancing/outlier_detection/outlier_detection.cc', + 'src/core/load_balancing/outlier_detection/outlier_detection.h', + 'src/core/load_balancing/pick_first/pick_first.cc', + 'src/core/load_balancing/pick_first/pick_first.h', + 'src/core/load_balancing/priority/priority.cc', + 'src/core/load_balancing/ring_hash/ring_hash.cc', + 'src/core/load_balancing/ring_hash/ring_hash.h', + 'src/core/load_balancing/rls/rls.cc', + 'src/core/load_balancing/round_robin/round_robin.cc', + 'src/core/load_balancing/subchannel_interface.h', + 'src/core/load_balancing/subchannel_list.h', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h', + 'src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc', + 'src/core/load_balancing/weighted_target/weighted_target.cc', + 'src/core/load_balancing/xds/cds.cc', + 'src/core/load_balancing/xds/xds_channel_args.h', + 'src/core/load_balancing/xds/xds_cluster_impl.cc', + 'src/core/load_balancing/xds/xds_cluster_manager.cc', + 'src/core/load_balancing/xds/xds_override_host.cc', + 'src/core/load_balancing/xds/xds_override_host.h', + 'src/core/load_balancing/xds/xds_wrr_locality.cc', 'src/core/plugin_registry/grpc_plugin_registry.cc', 'src/core/plugin_registry/grpc_plugin_registry_extra.cc', 'src/core/tsi/alts/crypt/aes_gcm.cc', @@ -2350,26 +2350,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/dynamic_filters.h', 'src/core/ext/filters/client_channel/global_subchannel_pool.h', 'src/core/ext/filters/client_channel/http_proxy_mapper.h', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.h', - 'src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.h', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h', - 'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h', 'src/core/ext/filters/client_channel/local_subchannel_pool.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h', @@ -3182,11 +3162,6 @@ Pod::Spec.new do |s| 'src/core/lib/json/json_reader.h', 'src/core/lib/json/json_util.h', 'src/core/lib/json/json_writer.h', - 'src/core/lib/load_balancing/delegating_helper.h', - 'src/core/lib/load_balancing/lb_policy.h', - 'src/core/lib/load_balancing/lb_policy_factory.h', - 'src/core/lib/load_balancing/lb_policy_registry.h', - 'src/core/lib/load_balancing/subchannel_interface.h', 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -3343,6 +3318,31 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/uri/uri_parser.h', + 'src/core/load_balancing/address_filtering.h', + 'src/core/load_balancing/backend_metric_data.h', + 'src/core/load_balancing/child_policy_handler.h', + 'src/core/load_balancing/delegating_helper.h', + 'src/core/load_balancing/endpoint_list.h', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.h', + 'src/core/load_balancing/grpclb/grpclb.h', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.h', + 'src/core/load_balancing/grpclb/grpclb_client_stats.h', + 'src/core/load_balancing/grpclb/load_balancer_api.h', + 'src/core/load_balancing/health_check_client.h', + 'src/core/load_balancing/health_check_client_internal.h', + 'src/core/load_balancing/lb_policy.h', + 'src/core/load_balancing/lb_policy_factory.h', + 'src/core/load_balancing/lb_policy_registry.h', + 'src/core/load_balancing/oob_backend_metric.h', + 'src/core/load_balancing/oob_backend_metric_internal.h', + 'src/core/load_balancing/outlier_detection/outlier_detection.h', + 'src/core/load_balancing/pick_first/pick_first.h', + 'src/core/load_balancing/ring_hash/ring_hash.h', + 'src/core/load_balancing/subchannel_interface.h', + 'src/core/load_balancing/subchannel_list.h', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h', + 'src/core/load_balancing/xds/xds_channel_args.h', + 'src/core/load_balancing/xds/xds_override_host.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', diff --git a/grpc.gemspec b/grpc.gemspec index 392ba76a0a1..b78139acfa3 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -155,50 +155,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/filters/client_channel/global_subchannel_pool.h ) s.files += %w( src/core/ext/filters/client_channel/http_proxy_mapper.cc ) s.files += %w( src/core/ext/filters/client_channel/http_proxy_mapper.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/address_filtering.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/address_filtering.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/endpoint_list.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/health_check_client.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/health_check_client.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/priority/priority.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/rls/rls.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/subchannel_list.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/cds.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h ) - s.files += %w( src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc ) s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.cc ) s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.h ) s.files += %w( src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc ) @@ -1651,13 +1607,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/json/json_util.h ) s.files += %w( src/core/lib/json/json_writer.cc ) s.files += %w( src/core/lib/json/json_writer.h ) - s.files += %w( src/core/lib/load_balancing/delegating_helper.h ) - s.files += %w( src/core/lib/load_balancing/lb_policy.cc ) - s.files += %w( src/core/lib/load_balancing/lb_policy.h ) - s.files += %w( src/core/lib/load_balancing/lb_policy_factory.h ) - s.files += %w( src/core/lib/load_balancing/lb_policy_registry.cc ) - s.files += %w( src/core/lib/load_balancing/lb_policy_registry.h ) - s.files += %w( src/core/lib/load_balancing/subchannel_interface.h ) s.files += %w( src/core/lib/matchers/matchers.cc ) s.files += %w( src/core/lib/matchers/matchers.h ) s.files += %w( src/core/lib/promise/activity.cc ) @@ -1946,6 +1895,57 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/transport_op_string.cc ) s.files += %w( src/core/lib/uri/uri_parser.cc ) s.files += %w( src/core/lib/uri/uri_parser.h ) + s.files += %w( src/core/load_balancing/address_filtering.cc ) + s.files += %w( src/core/load_balancing/address_filtering.h ) + s.files += %w( src/core/load_balancing/backend_metric_data.h ) + s.files += %w( src/core/load_balancing/child_policy_handler.cc ) + s.files += %w( src/core/load_balancing/child_policy_handler.h ) + s.files += %w( src/core/load_balancing/delegating_helper.h ) + s.files += %w( src/core/load_balancing/endpoint_list.cc ) + s.files += %w( src/core/load_balancing/endpoint_list.h ) + s.files += %w( src/core/load_balancing/grpclb/client_load_reporting_filter.cc ) + s.files += %w( src/core/load_balancing/grpclb/client_load_reporting_filter.h ) + s.files += %w( src/core/load_balancing/grpclb/grpclb.cc ) + s.files += %w( src/core/load_balancing/grpclb/grpclb.h ) + s.files += %w( src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc ) + s.files += %w( src/core/load_balancing/grpclb/grpclb_balancer_addresses.h ) + s.files += %w( src/core/load_balancing/grpclb/grpclb_client_stats.cc ) + s.files += %w( src/core/load_balancing/grpclb/grpclb_client_stats.h ) + s.files += %w( src/core/load_balancing/grpclb/load_balancer_api.cc ) + s.files += %w( src/core/load_balancing/grpclb/load_balancer_api.h ) + s.files += %w( src/core/load_balancing/health_check_client.cc ) + s.files += %w( src/core/load_balancing/health_check_client.h ) + s.files += %w( src/core/load_balancing/health_check_client_internal.h ) + s.files += %w( src/core/load_balancing/lb_policy.cc ) + s.files += %w( src/core/load_balancing/lb_policy.h ) + s.files += %w( src/core/load_balancing/lb_policy_factory.h ) + s.files += %w( src/core/load_balancing/lb_policy_registry.cc ) + s.files += %w( src/core/load_balancing/lb_policy_registry.h ) + s.files += %w( src/core/load_balancing/oob_backend_metric.cc ) + s.files += %w( src/core/load_balancing/oob_backend_metric.h ) + s.files += %w( src/core/load_balancing/oob_backend_metric_internal.h ) + s.files += %w( src/core/load_balancing/outlier_detection/outlier_detection.cc ) + s.files += %w( src/core/load_balancing/outlier_detection/outlier_detection.h ) + s.files += %w( src/core/load_balancing/pick_first/pick_first.cc ) + s.files += %w( src/core/load_balancing/pick_first/pick_first.h ) + s.files += %w( src/core/load_balancing/priority/priority.cc ) + s.files += %w( src/core/load_balancing/ring_hash/ring_hash.cc ) + s.files += %w( src/core/load_balancing/ring_hash/ring_hash.h ) + s.files += %w( src/core/load_balancing/rls/rls.cc ) + s.files += %w( src/core/load_balancing/round_robin/round_robin.cc ) + s.files += %w( src/core/load_balancing/subchannel_interface.h ) + s.files += %w( src/core/load_balancing/subchannel_list.h ) + s.files += %w( src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc ) + s.files += %w( src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h ) + s.files += %w( src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc ) + s.files += %w( src/core/load_balancing/weighted_target/weighted_target.cc ) + s.files += %w( src/core/load_balancing/xds/cds.cc ) + s.files += %w( src/core/load_balancing/xds/xds_channel_args.h ) + s.files += %w( src/core/load_balancing/xds/xds_cluster_impl.cc ) + s.files += %w( src/core/load_balancing/xds/xds_cluster_manager.cc ) + s.files += %w( src/core/load_balancing/xds/xds_override_host.cc ) + s.files += %w( src/core/load_balancing/xds/xds_override_host.h ) + s.files += %w( src/core/load_balancing/xds/xds_wrr_locality.cc ) s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc ) s.files += %w( src/core/plugin_registry/grpc_plugin_registry_extra.cc ) s.files += %w( src/core/tsi/alts/crypt/aes_gcm.cc ) diff --git a/grpc.gyp b/grpc.gyp index 4e36b01858c..b43595e2b0d 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -290,30 +290,6 @@ 'src/core/ext/filters/client_channel/dynamic_filters.cc', 'src/core/ext/filters/client_channel/global_subchannel_pool.cc', 'src/core/ext/filters/client_channel/http_proxy_mapper.cc', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.cc', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.cc', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', - 'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc', - 'src/core/ext/filters/client_channel/lb_policy/rls/rls.cc', - 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/cds.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc', 'src/core/ext/filters/client_channel/local_subchannel_pool.cc', 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', @@ -908,8 +884,6 @@ 'src/core/lib/json/json_reader.cc', 'src/core/lib/json/json_util.cc', 'src/core/lib/json/json_writer.cc', - 'src/core/lib/load_balancing/lb_policy.cc', - 'src/core/lib/load_balancing/lb_policy_registry.cc', 'src/core/lib/matchers/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', @@ -1042,6 +1016,32 @@ 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', 'src/core/lib/uri/uri_parser.cc', + 'src/core/load_balancing/address_filtering.cc', + 'src/core/load_balancing/child_policy_handler.cc', + 'src/core/load_balancing/endpoint_list.cc', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.cc', + 'src/core/load_balancing/grpclb/grpclb.cc', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc', + 'src/core/load_balancing/grpclb/grpclb_client_stats.cc', + 'src/core/load_balancing/grpclb/load_balancer_api.cc', + 'src/core/load_balancing/health_check_client.cc', + 'src/core/load_balancing/lb_policy.cc', + 'src/core/load_balancing/lb_policy_registry.cc', + 'src/core/load_balancing/oob_backend_metric.cc', + 'src/core/load_balancing/outlier_detection/outlier_detection.cc', + 'src/core/load_balancing/pick_first/pick_first.cc', + 'src/core/load_balancing/priority/priority.cc', + 'src/core/load_balancing/ring_hash/ring_hash.cc', + 'src/core/load_balancing/rls/rls.cc', + 'src/core/load_balancing/round_robin/round_robin.cc', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc', + 'src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc', + 'src/core/load_balancing/weighted_target/weighted_target.cc', + 'src/core/load_balancing/xds/cds.cc', + 'src/core/load_balancing/xds/xds_cluster_impl.cc', + 'src/core/load_balancing/xds/xds_cluster_manager.cc', + 'src/core/load_balancing/xds/xds_override_host.cc', + 'src/core/load_balancing/xds/xds_wrr_locality.cc', 'src/core/plugin_registry/grpc_plugin_registry.cc', 'src/core/plugin_registry/grpc_plugin_registry_extra.cc', 'src/core/tsi/alts/crypt/aes_gcm.cc', @@ -1162,24 +1162,6 @@ 'src/core/ext/filters/client_channel/dynamic_filters.cc', 'src/core/ext/filters/client_channel/global_subchannel_pool.cc', 'src/core/ext/filters/client_channel/http_proxy_mapper.cc', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.cc', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.cc', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', - 'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc', - 'src/core/ext/filters/client_channel/lb_policy/rls/rls.cc', - 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc', 'src/core/ext/filters/client_channel/local_subchannel_pool.cc', 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', @@ -1435,8 +1417,6 @@ 'src/core/lib/json/json_object_loader.cc', 'src/core/lib/json/json_reader.cc', 'src/core/lib/json/json_writer.cc', - 'src/core/lib/load_balancing/lb_policy.cc', - 'src/core/lib/load_balancing/lb_policy_registry.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/sleep.cc', @@ -1534,6 +1514,26 @@ 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', 'src/core/lib/uri/uri_parser.cc', + 'src/core/load_balancing/address_filtering.cc', + 'src/core/load_balancing/child_policy_handler.cc', + 'src/core/load_balancing/endpoint_list.cc', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.cc', + 'src/core/load_balancing/grpclb/grpclb.cc', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc', + 'src/core/load_balancing/grpclb/grpclb_client_stats.cc', + 'src/core/load_balancing/grpclb/load_balancer_api.cc', + 'src/core/load_balancing/health_check_client.cc', + 'src/core/load_balancing/lb_policy.cc', + 'src/core/load_balancing/lb_policy_registry.cc', + 'src/core/load_balancing/oob_backend_metric.cc', + 'src/core/load_balancing/outlier_detection/outlier_detection.cc', + 'src/core/load_balancing/pick_first/pick_first.cc', + 'src/core/load_balancing/priority/priority.cc', + 'src/core/load_balancing/rls/rls.cc', + 'src/core/load_balancing/round_robin/round_robin.cc', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc', + 'src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc', + 'src/core/load_balancing/weighted_target/weighted_target.cc', 'src/core/plugin_registry/grpc_plugin_registry.cc', 'src/core/plugin_registry/grpc_plugin_registry_noextra.cc', 'src/core/tsi/alts/handshaker/transport_security_common_api.cc', @@ -2207,8 +2207,6 @@ 'src/core/lib/iomgr/wakeup_fd_posix.cc', 'src/core/lib/json/json_reader.cc', 'src/core/lib/json/json_writer.cc', - 'src/core/lib/load_balancing/lb_policy.cc', - 'src/core/lib/load_balancing/lb_policy_registry.cc', 'src/core/lib/matchers/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', @@ -2304,6 +2302,8 @@ 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', 'src/core/lib/uri/uri_parser.cc', + 'src/core/load_balancing/lb_policy.cc', + 'src/core/load_balancing/lb_policy_registry.cc', 'src/core/tsi/alts/handshaker/transport_security_common_api.cc', 'src/core/tsi/transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', diff --git a/package.xml b/package.xml index 1e28a2a052f..2248624d4d4 100644 --- a/package.xml +++ b/package.xml @@ -137,50 +137,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1633,13 +1589,6 @@ - - - - - - - @@ -1928,6 +1877,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/BUILD b/src/core/BUILD index 60003cf37bf..6ee421b2c23 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -2971,8 +2971,8 @@ grpc_cc_library( grpc_cc_library( name = "lb_policy", - srcs = ["lib/load_balancing/lb_policy.cc"], - hdrs = ["lib/load_balancing/lb_policy.h"], + srcs = ["load_balancing/lb_policy.cc"], + hdrs = ["load_balancing/lb_policy.h"], external_deps = [ "absl/base:core_headers", "absl/status", @@ -3007,7 +3007,7 @@ grpc_cc_library( grpc_cc_library( name = "lb_policy_factory", - hdrs = ["lib/load_balancing/lb_policy_factory.h"], + hdrs = ["load_balancing/lb_policy_factory.h"], external_deps = [ "absl/status:statusor", "absl/strings", @@ -3023,8 +3023,8 @@ grpc_cc_library( grpc_cc_library( name = "lb_policy_registry", - srcs = ["lib/load_balancing/lb_policy_registry.cc"], - hdrs = ["lib/load_balancing/lb_policy_registry.h"], + srcs = ["load_balancing/lb_policy_registry.cc"], + hdrs = ["load_balancing/lb_policy_registry.h"], external_deps = [ "absl/status", "absl/status:statusor", @@ -3043,7 +3043,7 @@ grpc_cc_library( grpc_cc_library( name = "subchannel_interface", - hdrs = ["lib/load_balancing/subchannel_interface.h"], + hdrs = ["load_balancing/subchannel_interface.h"], external_deps = ["absl/status"], deps = [ "dual_ref_counted", @@ -3056,7 +3056,7 @@ grpc_cc_library( grpc_cc_library( name = "delegating_helper", - hdrs = ["lib/load_balancing/delegating_helper.h"], + hdrs = ["load_balancing/delegating_helper.h"], external_deps = [ "absl/status", "absl/strings", @@ -3326,9 +3326,9 @@ grpc_cc_library( "lib/security/security_connector/fake/fake_security_connector.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/grpclb/grpclb.h", "lib/security/credentials/fake/fake_credentials.h", "lib/security/security_connector/fake/fake_security_connector.h", + "load_balancing/grpclb/grpclb.h", ], external_deps = [ "absl/status", @@ -3506,8 +3506,8 @@ grpc_cc_library( "lib/security/credentials/google_default/google_default_credentials.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/grpclb/grpclb.h", "lib/security/credentials/google_default/google_default_credentials.h", + "load_balancing/grpclb/grpclb.h", ], external_deps = [ "absl/status:statusor", @@ -4272,16 +4272,16 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_grpclb", srcs = [ - "ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc", - "ext/filters/client_channel/lb_policy/grpclb/grpclb.cc", - "ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc", - "ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc", + "load_balancing/grpclb/client_load_reporting_filter.cc", + "load_balancing/grpclb/grpclb.cc", + "load_balancing/grpclb/grpclb_client_stats.cc", + "load_balancing/grpclb/load_balancer_api.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h", - "ext/filters/client_channel/lb_policy/grpclb/grpclb.h", - "ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h", - "ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h", + "load_balancing/grpclb/client_load_reporting_filter.h", + "load_balancing/grpclb/grpclb.h", + "load_balancing/grpclb/grpclb_client_stats.h", + "load_balancing/grpclb/load_balancer_api.h", ], external_deps = [ "absl/base:core_headers", @@ -4373,7 +4373,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_backend_metric_data", hdrs = [ - "ext/filters/client_channel/lb_policy/backend_metric_data.h", + "load_balancing/backend_metric_data.h", ], external_deps = ["absl/strings"], language = "c++", @@ -4391,7 +4391,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_rls", srcs = [ - "ext/filters/client_channel/lb_policy/rls/rls.cc", + "load_balancing/rls/rls.cc", ], external_deps = [ "absl/base:core_headers", @@ -4767,7 +4767,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_cds", srcs = [ - "ext/filters/client_channel/lb_policy/xds/cds.cc", + "load_balancing/xds/cds.cc", ], external_deps = [ "absl/status", @@ -4813,7 +4813,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_xds_channel_args", hdrs = [ - "ext/filters/client_channel/lb_policy/xds/xds_channel_args.h", + "load_balancing/xds/xds_channel_args.h", ], language = "c++", deps = [ @@ -4825,7 +4825,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_xds_cluster_impl", srcs = [ - "ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc", + "load_balancing/xds/xds_cluster_impl.cc", ], external_deps = [ "absl/base:core_headers", @@ -4871,7 +4871,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_xds_cluster_manager", srcs = [ - "ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc", + "load_balancing/xds/xds_cluster_manager.cc", ], external_deps = [ "absl/status", @@ -4912,7 +4912,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_xds_wrr_locality", srcs = [ - "ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc", + "load_balancing/xds/xds_wrr_locality.cc", ], external_deps = [ "absl/status", @@ -4949,10 +4949,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_address_filtering", srcs = [ - "ext/filters/client_channel/lb_policy/address_filtering.cc", + "load_balancing/address_filtering.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/address_filtering.h", + "load_balancing/address_filtering.h", ], external_deps = [ "absl/functional:function_ref", @@ -4974,11 +4974,11 @@ grpc_cc_library( grpc_cc_library( name = "health_check_client", srcs = [ - "ext/filters/client_channel/lb_policy/health_check_client.cc", + "load_balancing/health_check_client.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/health_check_client.h", - "ext/filters/client_channel/lb_policy/health_check_client_internal.h", + "load_balancing/health_check_client.h", + "load_balancing/health_check_client_internal.h", ], external_deps = [ "absl/base:core_headers", @@ -5019,7 +5019,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_subchannel_list", hdrs = [ - "ext/filters/client_channel/lb_policy/subchannel_list.h", + "load_balancing/subchannel_list.h", ], external_deps = [ "absl/status", @@ -5048,10 +5048,10 @@ grpc_cc_library( grpc_cc_library( name = "lb_endpoint_list", srcs = [ - "ext/filters/client_channel/lb_policy/endpoint_list.cc", + "load_balancing/endpoint_list.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/endpoint_list.h", + "load_balancing/endpoint_list.h", ], external_deps = [ "absl/functional:function_ref", @@ -5084,10 +5084,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_pick_first", srcs = [ - "ext/filters/client_channel/lb_policy/pick_first/pick_first.cc", + "load_balancing/pick_first/pick_first.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/pick_first/pick_first.h", + "load_balancing/pick_first/pick_first.h", ], external_deps = [ "absl/algorithm:container", @@ -5199,10 +5199,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_ring_hash", srcs = [ - "ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc", + "load_balancing/ring_hash/ring_hash.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h", + "load_balancing/ring_hash/ring_hash.h", ], external_deps = [ "absl/base:core_headers", @@ -5252,7 +5252,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_round_robin", srcs = [ - "ext/filters/client_channel/lb_policy/round_robin/round_robin.cc", + "load_balancing/round_robin/round_robin.cc", ], external_deps = [ "absl/meta:type_traits", @@ -5289,10 +5289,10 @@ grpc_cc_library( grpc_cc_library( name = "static_stride_scheduler", srcs = [ - "ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc", + "load_balancing/weighted_round_robin/static_stride_scheduler.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h", + "load_balancing/weighted_round_robin/static_stride_scheduler.h", ], external_deps = [ "absl/functional:any_invocable", @@ -5306,7 +5306,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_weighted_round_robin", srcs = [ - "ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc", + "load_balancing/weighted_round_robin/weighted_round_robin.cc", ], external_deps = [ "absl/base:core_headers", @@ -5358,7 +5358,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_outlier_detection_header", hdrs = [ - "ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h", + "load_balancing/outlier_detection/outlier_detection.h", ], external_deps = ["absl/types:optional"], language = "c++", @@ -5375,7 +5375,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_outlier_detection", srcs = [ - "ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc", + "load_balancing/outlier_detection/outlier_detection.cc", ], external_deps = [ "absl/base:core_headers", @@ -5423,7 +5423,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_priority", srcs = [ - "ext/filters/client_channel/lb_policy/priority/priority.cc", + "load_balancing/priority/priority.cc", ], external_deps = [ "absl/status", @@ -5465,7 +5465,7 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_weighted_target", srcs = [ - "ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc", + "load_balancing/weighted_target/weighted_target.cc", ], external_deps = [ "absl/base:core_headers", @@ -5508,10 +5508,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_lb_policy_xds_override_host", srcs = [ - "ext/filters/client_channel/lb_policy/xds/xds_override_host.cc", + "load_balancing/xds/xds_override_host.cc", ], hdrs = [ - "ext/filters/client_channel/lb_policy/xds/xds_override_host.h", + "load_balancing/xds/xds_override_host.h", ], external_deps = [ "absl/base:core_headers", diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index f7ad5b4ce32..85c6d318bf6 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -32,7 +32,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/config/core_configuration.h" @@ -43,6 +42,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/load_balancing/backend_metric_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/backend_metric.h b/src/core/ext/filters/client_channel/backend_metric.h index 8ad0bff053b..e6d12bbd57a 100644 --- a/src/core/ext/filters/client_channel/backend_metric.h +++ b/src/core/ext/filters/client_channel/backend_metric.h @@ -23,7 +23,7 @@ #include "absl/strings/string_view.h" -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" +#include "src/core/load_balancing/backend_metric_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index c5391aff84e..47647a2da08 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -57,7 +57,6 @@ #include "src/core/ext/filters/client_channel/config_selector.h" #include "src/core/ext/filters/client_channel/dynamic_filters.h" #include "src/core/ext/filters/client_channel/global_subchannel_pool.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" #include "src/core/ext/filters/client_channel/local_subchannel_pool.h" #include "src/core/ext/filters/client_channel/retry_filter.h" #include "src/core/ext/filters/client_channel/subchannel.h" @@ -84,8 +83,6 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/latch.h" @@ -106,6 +103,9 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/load_balancing/child_policy_handler.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/subchannel_interface.h" // // Client channel filter diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h index 2e3b96af1d4..02f17796a19 100644 --- a/src/core/ext/filters/client_channel/client_channel.h +++ b/src/core/ext/filters/client_channel/client_channel.h @@ -40,7 +40,6 @@ #include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/ext/filters/client_channel/config_selector.h" #include "src/core/ext/filters/client_channel/dynamic_filters.h" -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/lib/channel/call_tracer.h" @@ -61,7 +60,6 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/polling_entity.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/resolver/resolver.h" @@ -72,6 +70,8 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/lb_policy.h" // // Client channel filter diff --git a/src/core/ext/filters/client_channel/client_channel_internal.h b/src/core/ext/filters/client_channel/client_channel_internal.h index c0985c9ac28..2559068b56b 100644 --- a/src/core/ext/filters/client_channel/client_channel_internal.h +++ b/src/core/ext/filters/client_channel/client_channel_internal.h @@ -28,9 +28,9 @@ #include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/service_config/service_config_call_data.h" +#include "src/core/load_balancing/lb_policy.h" // // This file contains internal interfaces used to allow various plugins diff --git a/src/core/ext/filters/client_channel/client_channel_service_config.cc b/src/core/ext/filters/client_channel/client_channel_service_config.cc index 679be210743..62a606775c2 100644 --- a/src/core/ext/filters/client_channel/client_channel_service_config.cc +++ b/src/core/ext/filters/client_channel/client_channel_service_config.cc @@ -27,7 +27,7 @@ #include "absl/strings/str_cat.h" #include "absl/types/optional.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/lb_policy_registry.h" // As per the retry design, we do not allow more than 5 retry attempts. #define MAX_MAX_RETRY_ATTEMPTS 5 diff --git a/src/core/ext/filters/client_channel/client_channel_service_config.h b/src/core/ext/filters/client_channel/client_channel_service_config.h index 5ce7a4baf66..74a8a770292 100644 --- a/src/core/ext/filters/client_channel/client_channel_service_config.h +++ b/src/core/ext/filters/client_channel/client_channel_service_config.h @@ -35,8 +35,8 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/load_balancing/lb_policy.h" namespace grpc_core { namespace internal { diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 59ccfc1f8ee..81d7eed6c76 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -62,7 +62,6 @@ #include "absl/strings/str_cat.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/resolver/polling_resolver.h" #include "src/core/lib/backoff/backoff.h" @@ -72,6 +71,7 @@ #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/service_config/service_config_impl.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index 4570bb47eaa..309acf50a7c 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc @@ -38,7 +38,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h" #include "src/core/ext/filters/client_channel/resolver/polling_resolver.h" #include "src/core/lib/backoff/backoff.h" @@ -57,6 +56,7 @@ #include "src/core/lib/resolver/resolver_factory.h" #include "src/core/lib/service_config/service_config.h" #include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" // IWYU pragma: no_include diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc index 934881d96a7..03e4e975e95 100644 --- a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc +++ b/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc @@ -20,12 +20,12 @@ #include "absl/strings/str_join.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h" #include "src/core/ext/xds/xds_routing.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/match.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc index 9cc094f0499..a94b8f53c2e 100644 --- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc @@ -50,7 +50,6 @@ #include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/ext/filters/client_channel/config_selector.h" -#include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h" @@ -93,6 +92,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" +#include "src/core/load_balancing/ring_hash/ring_hash.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/subchannel_interface_internal.h b/src/core/ext/filters/client_channel/subchannel_interface_internal.h index b71f378de5c..d1c353fd0cb 100644 --- a/src/core/ext/filters/client_channel/subchannel_interface_internal.h +++ b/src/core/ext/filters/client_channel/subchannel_interface_internal.h @@ -21,7 +21,7 @@ #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/subchannel_interface.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_cluster.cc b/src/core/ext/xds/xds_cluster.cc index 5c2cca5933e..a12b20d8252 100644 --- a/src/core/ext/xds/xds_cluster.cc +++ b/src/core/ext/xds/xds_cluster.cc @@ -69,8 +69,8 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" #include "src/core/lib/matchers/matchers.h" +#include "src/core/load_balancing/lb_policy_registry.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_cluster.h b/src/core/ext/xds/xds_cluster.h index 405e6e9c25a..a8bf915a22c 100644 --- a/src/core/ext/xds/xds_cluster.h +++ b/src/core/ext/xds/xds_cluster.h @@ -36,7 +36,6 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_client.h" @@ -45,6 +44,7 @@ #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/ext/xds/xds_resource_type_impl.h" #include "src/core/lib/json/json.h" +#include "src/core/load_balancing/outlier_detection/outlier_detection.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_lb_policy_registry.cc b/src/core/ext/xds/xds_lb_policy_registry.cc index a8cb6de128e..e10b55d4b6f 100644 --- a/src/core/ext/xds/xds_lb_policy_registry.cc +++ b/src/core/ext/xds/xds_lb_policy_registry.cc @@ -40,7 +40,7 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/lb_policy_registry.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_route_config.cc b/src/core/ext/xds/xds_route_config.cc index e4191d1ea3e..d248721b333 100644 --- a/src/core/ext/xds/xds_route_config.cc +++ b/src/core/ext/xds/xds_route_config.cc @@ -74,8 +74,8 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" #include "src/core/lib/matchers/matchers.h" +#include "src/core/load_balancing/lb_policy_registry.h" namespace grpc_core { diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h index 88e19038557..d46138b7da4 100644 --- a/src/core/lib/config/core_configuration.h +++ b/src/core/lib/config/core_configuration.h @@ -25,13 +25,13 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/handshaker/proxy_mapper_registry.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/resolver_registry.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/service_config/service_config_parser.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/handshaker_registry.h" +#include "src/core/load_balancing/lb_policy_registry.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 15755378a06..517e8a85f64 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -38,8 +38,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/env.h" @@ -70,6 +68,8 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/uri/uri_parser.h" +#include "src/core/load_balancing/grpclb/grpclb.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc index e93df47cc90..e7e4d11088b 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.cc +++ b/src/core/lib/security/credentials/xds/xds_credentials.cc @@ -26,7 +26,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/xds/xds_certificate_provider.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" @@ -34,6 +33,7 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index ca672ab48b6..87a27ddfe2c 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -38,7 +38,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" @@ -58,6 +57,7 @@ #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/lib/transport/handshaker.h" +#include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/.clang-format b/src/core/load_balancing/.clang-format similarity index 100% rename from src/core/ext/filters/client_channel/lb_policy/.clang-format rename to src/core/load_balancing/.clang-format diff --git a/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc b/src/core/load_balancing/address_filtering.cc similarity index 97% rename from src/core/ext/filters/client_channel/lb_policy/address_filtering.cc rename to src/core/load_balancing/address_filtering.cc index bac15550d2d..2d0731156d9 100644 --- a/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +++ b/src/core/load_balancing/address_filtering.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/address_filtering.h" +#include "src/core/load_balancing/address_filtering.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/address_filtering.h b/src/core/load_balancing/address_filtering.h similarity index 94% rename from src/core/ext/filters/client_channel/lb_policy/address_filtering.h rename to src/core/load_balancing/address_filtering.h index 924261669bd..1f39f5d6cc9 100644 --- a/src/core/ext/filters/client_channel/lb_policy/address_filtering.h +++ b/src/core/load_balancing/address_filtering.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ADDRESS_FILTERING_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ADDRESS_FILTERING_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H +#define GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H #include @@ -115,4 +115,4 @@ absl::StatusOr MakeHierarchicalAddressMap( } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ADDRESS_FILTERING_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H diff --git a/src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h b/src/core/load_balancing/backend_metric_data.h similarity index 89% rename from src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h rename to src/core/load_balancing/backend_metric_data.h index 7a5db929c17..036298681de 100644 --- a/src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h +++ b/src/core/load_balancing/backend_metric_data.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H +#define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H #include @@ -54,4 +54,4 @@ struct BackendMetricData { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H diff --git a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc rename to src/core/load_balancing/child_policy_handler.cc index bb5829b4dc3..cb511b8e910 100644 --- a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +++ b/src/core/load_balancing/child_policy_handler.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include "src/core/load_balancing/child_policy_handler.h" #include #include @@ -33,9 +33,9 @@ #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/transport/connectivity_state.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h similarity index 90% rename from src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h rename to src/core/load_balancing/child_policy_handler.h index c9a1ee42ee2..19d37a1a012 100644 --- a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h +++ b/src/core/load_balancing/child_policy_handler.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H +#define GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H #include #include @@ -27,7 +27,7 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy.h" namespace grpc_core { @@ -85,4 +85,4 @@ class ChildPolicyHandler : public LoadBalancingPolicy { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H diff --git a/src/core/lib/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h similarity index 92% rename from src/core/lib/load_balancing/delegating_helper.h rename to src/core/load_balancing/delegating_helper.h index 57e7f3c0f3e..389fdea4542 100644 --- a/src/core/lib/load_balancing/delegating_helper.h +++ b/src/core/load_balancing/delegating_helper.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_DELEGATING_HELPER_H -#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_DELEGATING_HELPER_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H +#define GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H #include @@ -32,8 +32,8 @@ #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/security/credentials/credentials.h" namespace grpc_core { @@ -113,4 +113,4 @@ class LoadBalancingPolicy::ParentOwningDelegatingChannelControlHelper } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_LOAD_BALANCING_DELEGATING_HELPER_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H diff --git a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc similarity index 95% rename from src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc rename to src/core/load_balancing/endpoint_list.cc index 9c74cb8bb9a..10f5151ff94 100644 --- a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc +++ b/src/core/load_balancing/endpoint_list.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/endpoint_list.h" +#include "src/core/load_balancing/endpoint_list.h" #include @@ -32,7 +32,7 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h" +#include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/debug_location.h" @@ -40,9 +40,9 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h b/src/core/load_balancing/endpoint_list.h similarity index 95% rename from src/core/ext/filters/client_channel/lb_policy/endpoint_list.h rename to src/core/load_balancing/endpoint_list.h index 8977dabf9ce..f56027f88f7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ENDPOINT_LIST_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ENDPOINT_LIST_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H +#define GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H #include @@ -37,8 +37,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" namespace grpc_core { @@ -217,4 +217,4 @@ class EndpointList : public InternallyRefCounted { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ENDPOINT_LIST_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc similarity index 94% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc rename to src/core/load_balancing/grpclb/client_load_reporting_filter.cc index a83150321a4..3b139fa8a4c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc @@ -18,7 +18,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h" +#include "src/core/load_balancing/grpclb/client_load_reporting_filter.h" #include #include @@ -27,7 +27,7 @@ #include "absl/types/optional.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" +#include "src/core/load_balancing/grpclb/grpclb_client_stats.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h b/src/core/load_balancing/grpclb/client_load_reporting_filter.h similarity index 82% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h rename to src/core/load_balancing/grpclb/client_load_reporting_filter.h index 5ce3e68bf5c..474a4a5464f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H +#define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H #include @@ -43,4 +43,4 @@ class ClientLoadReportingFilter : public ChannelFilter { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc rename to src/core/load_balancing/grpclb/grpclb.cc index a6ff725a39c..812658ccde8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -51,7 +51,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" +#include "src/core/load_balancing/grpclb/grpclb.h" #include #include @@ -94,11 +94,11 @@ #include #include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" +#include "src/core/load_balancing/child_policy_handler.h" +#include "src/core/load_balancing/grpclb/client_load_reporting_filter.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" +#include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/load_balancing/grpclb/load_balancer_api.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/backoff/backoff.h" @@ -128,11 +128,11 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/resolver/resolver.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h b/src/core/load_balancing/grpclb/grpclb.h similarity index 85% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h rename to src/core/load_balancing/grpclb/grpclb.h index 1c361821bb5..e0a0c4cb8ec 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h +++ b/src/core/load_balancing/grpclb/grpclb.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_H +#define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_H #include @@ -36,4 +36,4 @@ #define GRPC_ARG_GRPCLB_SUBCHANNEL_CACHE_INTERVAL_MS \ "grpc.internal.grpclb_subchannel_cache_interval_ms" -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_H diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc similarity index 96% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc rename to src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc index 2624c3a5c19..06684a88ae0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc +++ b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.h similarity index 80% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h rename to src/core/load_balancing/grpclb/grpclb_balancer_addresses.h index adc689c6c01..cb6614fd17f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h +++ b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_BALANCER_ADDRESSES_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_BALANCER_ADDRESSES_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_BALANCER_ADDRESSES_H +#define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_BALANCER_ADDRESSES_H #include @@ -36,4 +36,4 @@ const EndpointAddressesList* FindGrpclbBalancerAddressesInChannelArgs( } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_BALANCER_ADDRESSES_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_BALANCER_ADDRESSES_H diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc b/src/core/load_balancing/grpclb/grpclb_client_stats.cc similarity index 97% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc rename to src/core/load_balancing/grpclb/grpclb_client_stats.cc index ca23f28609f..0d3cad26494 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.cc @@ -18,7 +18,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" +#include "src/core/load_balancing/grpclb/grpclb_client_stats.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h b/src/core/load_balancing/grpclb/grpclb_client_stats.h similarity index 89% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h rename to src/core/load_balancing/grpclb/grpclb_client_stats.h index b18a6ac4edd..809163938d3 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CLIENT_STATS_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CLIENT_STATS_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H +#define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H #include @@ -78,4 +78,4 @@ class GrpcLbClientStats : public RefCounted { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CLIENT_STATS_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/load_balancing/grpclb/load_balancer_api.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc rename to src/core/load_balancing/grpclb/load_balancer_api.cc index 457cd5a00ce..074e7f97f25 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +++ b/src/core/load_balancing/grpclb/load_balancer_api.cc @@ -18,7 +18,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" +#include "src/core/load_balancing/grpclb/load_balancer_api.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h similarity index 86% rename from src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h rename to src/core/load_balancing/grpclb/load_balancer_api.h index 9b7177d0597..e52a62d5454 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +++ b/src/core/load_balancing/grpclb/load_balancer_api.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H +#define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H #include #include @@ -29,7 +29,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" +#include "src/core/load_balancing/grpclb/grpclb_client_stats.h" #include "src/core/lib/gprpp/time.h" #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 @@ -74,4 +74,4 @@ bool GrpcLbResponseParse(const grpc_slice& serialized_response, } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H diff --git a/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc b/src/core/load_balancing/health_check_client.cc similarity index 99% rename from src/core/ext/filters/client_channel/lb_policy/health_check_client.cc rename to src/core/load_balancing/health_check_client.cc index f6e7e8c5903..dac81f49079 100644 --- a/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -42,7 +42,7 @@ #include "src/core/ext/filters/client_channel/client_channel_channelz.h" #include "src/core/ext/filters/client_channel/client_channel_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h" +#include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -59,7 +59,7 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/proto/grpc/health/v1/health.upb.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/health_check_client.h b/src/core/load_balancing/health_check_client.h similarity index 85% rename from src/core/ext/filters/client_channel/lb_policy/health_check_client.h rename to src/core/load_balancing/health_check_client.h index 04c9f139114..74205a3596b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/health_check_client.h +++ b/src/core/load_balancing/health_check_client.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_HEALTH_CHECK_CLIENT_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_HEALTH_CHECK_CLIENT_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H +#define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H #include @@ -23,7 +23,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/subchannel_interface.h" namespace grpc_core { @@ -49,4 +49,4 @@ MakeHealthCheckWatcher( } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_HEALTH_CHECK_CLIENT_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H diff --git a/src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h similarity index 95% rename from src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h rename to src/core/load_balancing/health_check_client_internal.h index 160cadd86fc..aeb48becc37 100644 --- a/src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h +++ b/src/core/load_balancing/health_check_client_internal.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_HEALTH_CHECK_CLIENT_INTERNAL_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_HEALTH_CHECK_CLIENT_INTERNAL_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H +#define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H #include @@ -42,7 +42,7 @@ #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/subchannel_interface.h" namespace grpc_core { @@ -201,4 +201,4 @@ class HealthWatcher : public InternalSubchannelDataWatcherInterface { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_HEALTH_CHECK_CLIENT_INTERNAL_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H diff --git a/src/core/lib/load_balancing/lb_policy.cc b/src/core/load_balancing/lb_policy.cc similarity index 98% rename from src/core/lib/load_balancing/lb_policy.cc rename to src/core/load_balancing/lb_policy.cc index 018f7069aac..79cd63868e8 100644 --- a/src/core/lib/load_balancing/lb_policy.cc +++ b/src/core/load_balancing/lb_policy.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h similarity index 98% rename from src/core/lib/load_balancing/lb_policy.h rename to src/core/load_balancing/lb_policy.h index a36280c163b..9224e1e61d2 100644 --- a/src/core/lib/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H -#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H +#define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H #include @@ -38,7 +38,7 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" +#include "src/core/load_balancing/backend_metric_data.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" @@ -50,7 +50,7 @@ #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" namespace grpc_core { @@ -478,4 +478,4 @@ class LoadBalancingPolicy : public InternallyRefCounted { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H diff --git a/src/core/lib/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h similarity index 85% rename from src/core/lib/load_balancing/lb_policy_factory.h rename to src/core/load_balancing/lb_policy_factory.h index 84486b582da..ca46e912d4a 100644 --- a/src/core/lib/load_balancing/lb_policy_factory.h +++ b/src/core/load_balancing/lb_policy_factory.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H -#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H +#define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H #include @@ -25,7 +25,7 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy.h" namespace grpc_core { @@ -46,4 +46,4 @@ class LoadBalancingPolicyFactory { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H diff --git a/src/core/lib/load_balancing/lb_policy_registry.cc b/src/core/load_balancing/lb_policy_registry.cc similarity index 97% rename from src/core/lib/load_balancing/lb_policy_registry.cc rename to src/core/load_balancing/lb_policy_registry.cc index 6d6c15eb4b2..a03219bb1e1 100644 --- a/src/core/lib/load_balancing/lb_policy_registry.cc +++ b/src/core/load_balancing/lb_policy_registry.cc @@ -16,7 +16,7 @@ #include -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include #include @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy.h" namespace grpc_core { diff --git a/src/core/lib/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h similarity index 89% rename from src/core/lib/load_balancing/lb_policy_registry.h rename to src/core/load_balancing/lb_policy_registry.h index 9201c121353..7e50b6d1474 100644 --- a/src/core/lib/load_balancing/lb_policy_registry.h +++ b/src/core/load_balancing/lb_policy_registry.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H -#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H +#define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H #include @@ -28,8 +28,8 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" namespace grpc_core { @@ -79,4 +79,4 @@ class LoadBalancingPolicyRegistry { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc rename to src/core/load_balancing/oob_backend_metric.cc index 36f149adf60..c3720577654 100644 --- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc +++ b/src/core/load_balancing/oob_backend_metric.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h" +#include "src/core/load_balancing/oob_backend_metric.h" #include @@ -40,7 +40,7 @@ #include "src/core/ext/filters/client_channel/backend_metric.h" #include "src/core/ext/filters/client_channel/client_channel_channelz.h" -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h" +#include "src/core/load_balancing/oob_backend_metric_internal.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/lib/channel/channel_trace.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h similarity index 81% rename from src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h rename to src/core/load_balancing/oob_backend_metric.h index fa930ee01a0..b31a4c748cb 100644 --- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h +++ b/src/core/load_balancing/oob_backend_metric.h @@ -14,16 +14,16 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OOB_BACKEND_METRIC_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OOB_BACKEND_METRIC_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H +#define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" +#include "src/core/load_balancing/backend_metric_data.h" #include "src/core/lib/gprpp/time.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/subchannel_interface.h" namespace grpc_core { @@ -54,4 +54,4 @@ MakeOobBackendMetricWatcher(Duration report_interval, } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OOB_BACKEND_METRIC_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h similarity index 90% rename from src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h rename to src/core/load_balancing/oob_backend_metric_internal.h index 3b8a54f7741..49667c3bad8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h +++ b/src/core/load_balancing/oob_backend_metric_internal.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OOB_BACKEND_METRIC_INTERNAL_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OOB_BACKEND_METRIC_INTERNAL_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H +#define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H #include @@ -28,8 +28,8 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/oob_backend_metric.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/ext/filters/client_channel/subchannel_stream_client.h" @@ -116,4 +116,4 @@ class OrcaWatcher : public InternalSubchannelDataWatcherInterface { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OOB_BACKEND_METRIC_INTERNAL_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H diff --git a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc rename to src/core/load_balancing/outlier_detection/outlier_detection.cc index 7a1abad0e01..14da92d770e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h" +#include "src/core/load_balancing/outlier_detection/outlier_detection.h" #include #include @@ -44,8 +44,8 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" -#include "src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h" +#include "src/core/load_balancing/child_policy_handler.h" +#include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" @@ -65,11 +65,11 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h similarity index 91% rename from src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h rename to src/core/load_balancing/outlier_detection/outlier_detection.h index 4118e99555c..fd247997f21 100644 --- a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h +++ b/src/core/load_balancing/outlier_detection/outlier_detection.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OUTLIER_DETECTION_OUTLIER_DETECTION_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OUTLIER_DETECTION_OUTLIER_DETECTION_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H +#define GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H #include @@ -91,4 +91,4 @@ struct OutlierDetectionConfig { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_OUTLIER_DETECTION_OUTLIER_DETECTION_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc similarity index 99% rename from src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc rename to src/core/load_balancing/pick_first/pick_first.cc index f2f9c8870fb..91a654f1ede 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h" +#include "src/core/load_balancing/pick_first/pick_first.h" #include #include @@ -41,7 +41,7 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/health_check_client.h" +#include "src/core/load_balancing/health_check_client.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -60,9 +60,9 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h b/src/core/load_balancing/pick_first/pick_first.h similarity index 84% rename from src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h rename to src/core/load_balancing/pick_first/pick_first.h index 4796742526d..0bbfee66c7a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h +++ b/src/core/load_balancing/pick_first/pick_first.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_PICK_FIRST_PICK_FIRST_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_PICK_FIRST_PICK_FIRST_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_PICK_FIRST_PICK_FIRST_H +#define GRPC_SRC_CORE_LOAD_BALANCING_PICK_FIRST_PICK_FIRST_H #include @@ -33,4 +33,4 @@ #define GRPC_ARG_INTERNAL_PICK_FIRST_OMIT_STATUS_MESSAGE_PREFIX \ GRPC_ARG_NO_SUBCHANNEL_PREFIX "pick_first_omit_status_message_prefix" -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_PICK_FIRST_PICK_FIRST_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_PICK_FIRST_PICK_FIRST_H diff --git a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc b/src/core/load_balancing/priority/priority.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/priority/priority.cc rename to src/core/load_balancing/priority/priority.cc index 25773602d89..4cbf19d9cd3 100644 --- a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +++ b/src/core/load_balancing/priority/priority.cc @@ -39,8 +39,8 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/address_filtering.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include "src/core/load_balancing/address_filtering.h" +#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" @@ -56,10 +56,10 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc rename to src/core/load_balancing/ring_hash/ring_hash.cc index bbe944681b7..7958e098290 100644 --- a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h" +#include "src/core/load_balancing/ring_hash/ring_hash.h" #include #include @@ -43,7 +43,7 @@ #include #include "src/core/ext/filters/client_channel/client_channel_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h" +#include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -62,10 +62,10 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h similarity index 87% rename from src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h rename to src/core/load_balancing/ring_hash/ring_hash.h index 5fee8319aaf..b70c3c9ddc1 100644 --- a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_RING_HASH_RING_HASH_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_RING_HASH_RING_HASH_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H +#define GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H #include @@ -59,4 +59,4 @@ struct RingHashConfig { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_RING_HASH_RING_HASH_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H diff --git a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc b/src/core/load_balancing/rls/rls.cc similarity index 99% rename from src/core/ext/filters/client_channel/lb_policy/rls/rls.cc rename to src/core/load_balancing/rls/rls.cc index 66758a47e41..62429272509 100644 --- a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -64,7 +64,7 @@ #include #include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz.h" @@ -87,10 +87,10 @@ #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/resolver/resolver_registry.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc similarity index 99% rename from src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc rename to src/core/load_balancing/round_robin/round_robin.cc index 7a580b1873f..0f2863d6a20 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -37,8 +37,8 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/endpoint_list.h" -#include "src/core/ext/filters/client_channel/lb_policy/subchannel_list.h" +#include "src/core/load_balancing/endpoint_list.h" +#include "src/core/load_balancing/subchannel_list.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" @@ -48,9 +48,9 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/resolver/server_address.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/lib/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h similarity index 96% rename from src/core/lib/load_balancing/subchannel_interface.h rename to src/core/load_balancing/subchannel_interface.h index 9a9e855546a..bc43ed764ca 100644 --- a/src/core/lib/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H -#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H +#define GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H #include @@ -138,4 +138,4 @@ class DelegatingSubchannel : public SubchannelInterface { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/load_balancing/subchannel_list.h similarity index 97% rename from src/core/ext/filters/client_channel/lb_policy/subchannel_list.h rename to src/core/load_balancing/subchannel_list.h index b5076a9f492..71a59015787 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/load_balancing/subchannel_list.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_SUBCHANNEL_LIST_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_SUBCHANNEL_LIST_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_LIST_H +#define GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_LIST_H #include @@ -32,7 +32,7 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/health_check_client.h" +#include "src/core/load_balancing/health_check_client.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/dual_ref_counted.h" @@ -40,8 +40,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/resolver/server_address.h" #include "src/core/lib/transport/connectivity_state.h" @@ -452,4 +452,4 @@ bool SubchannelList -#include "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h" +#include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h similarity index 88% rename from src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h rename to src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h index 53ff38f00ee..72c72a0ff79 100644 --- a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h +++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H +#define GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H #include @@ -68,4 +68,4 @@ class StaticStrideScheduler { } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc similarity index 99% rename from src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc rename to src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index 2bcf45a211b..6cafea50c1c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -46,11 +46,11 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" -#include "src/core/ext/filters/client_channel/lb_policy/endpoint_list.h" -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h" -#include "src/core/ext/filters/client_channel/lb_policy/subchannel_list.h" -#include "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/endpoint_list.h" +#include "src/core/load_balancing/oob_backend_metric.h" +#include "src/core/load_balancing/subchannel_list.h" +#include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -71,9 +71,9 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/resolver/server_address.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc rename to src/core/load_balancing/weighted_target/weighted_target.cc index 8be2f0de861..ca50b79bd66 100644 --- a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +++ b/src/core/load_balancing/weighted_target/weighted_target.cc @@ -40,8 +40,8 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/address_filtering.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include "src/core/load_balancing/address_filtering.h" +#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" @@ -57,10 +57,10 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/src/core/load_balancing/xds/cds.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/xds/cds.cc rename to src/core/load_balancing/xds/cds.cc index 0d51f391db6..d30724fd275 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +++ b/src/core/load_balancing/xds/cds.cc @@ -37,9 +37,9 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/address_filtering.h" -#include "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" +#include "src/core/load_balancing/address_filtering.h" +#include "src/core/load_balancing/outlier_detection/outlier_detection.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h" #include "src/core/ext/xds/xds_cluster.h" #include "src/core/ext/xds/xds_common_types.h" @@ -60,10 +60,10 @@ #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h b/src/core/load_balancing/xds/xds_channel_args.h similarity index 84% rename from src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h rename to src/core/load_balancing/xds/xds_channel_args.h index 1df82d2fa18..8f47a0796a9 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h +++ b/src/core/load_balancing/xds/xds_channel_args.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_CHANNEL_ARGS_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_CHANNEL_ARGS_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_CHANNEL_ARGS_H +#define GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_CHANNEL_ARGS_H #include @@ -34,4 +34,4 @@ #define GRPC_ARG_XDS_LOCALITY_WEIGHT \ GRPC_ARG_NO_SUBCHANNEL_PREFIX "xds_locality_weight" -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_CHANNEL_ARGS_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_CHANNEL_ARGS_H diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc rename to src/core/load_balancing/xds/xds_cluster_impl.cc index c495d83cd54..5fab4494a80 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -38,9 +38,9 @@ #include #include "src/core/ext/filters/client_channel/client_channel_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/child_policy_handler.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" @@ -62,11 +62,11 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc similarity index 98% rename from src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc rename to src/core/load_balancing/xds/xds_cluster_manager.cc index 447a1c5abf9..2693c61c9fd 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +++ b/src/core/load_balancing/xds/xds_cluster_manager.cc @@ -39,7 +39,7 @@ #include #include "src/core/ext/filters/client_channel/client_channel_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -55,10 +55,10 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc similarity index 99% rename from src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc rename to src/core/load_balancing/xds/xds_override_host.cc index 6f27ba90ecd..698a2af62c0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -16,7 +16,7 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h" +#include "src/core/load_balancing/xds/xds_override_host.h" #include @@ -48,7 +48,7 @@ #include #include "src/core/ext/filters/client_channel/client_channel_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h" #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/xds/xds_health_status.h" @@ -75,11 +75,11 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h similarity index 86% rename from src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h rename to src/core/load_balancing/xds/xds_override_host.h index 2cf33345421..6c4d18b96d0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h +++ b/src/core/load_balancing/xds/xds_override_host.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_OVERRIDE_HOST_H -#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_OVERRIDE_HOST_H +#ifndef GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H +#define GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H #include @@ -26,7 +26,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy.h" namespace grpc_core { @@ -60,4 +60,4 @@ class XdsOverrideHostLbConfig : public LoadBalancingPolicy::Config { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_OVERRIDE_HOST_H +#endif // GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc similarity index 97% rename from src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc rename to src/core/load_balancing/xds/xds_wrr_locality.cc index ee4b7794137..cf32f2082f8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/ext/xds/xds_client_stats.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -46,10 +46,10 @@ #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/lib/resolver/endpoint_addresses.h" namespace grpc_core { diff --git a/src/cpp/server/backend_metric_recorder.cc b/src/cpp/server/backend_metric_recorder.cc index 5fa2aada76b..020a2db6efe 100644 --- a/src/cpp/server/backend_metric_recorder.cc +++ b/src/cpp/server/backend_metric_recorder.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/lib/debug/trace.h" +#include "src/core/load_balancing/backend_metric_data.h" using grpc_core::BackendMetricData; diff --git a/src/cpp/server/backend_metric_recorder.h b/src/cpp/server/backend_metric_recorder.h index 6c5ad9e3346..0863d2b6a31 100644 --- a/src/cpp/server/backend_metric_recorder.h +++ b/src/cpp/server/backend_metric_recorder.h @@ -33,7 +33,7 @@ #include #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h" -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" +#include "src/core/load_balancing/backend_metric_data.h" namespace grpc { namespace experimental { diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 58a605e18e8..f139a95887f 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -44,13 +44,13 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/load_balancing/backend_metric_data.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 1b68ac8336b..9d766455be7 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -32,30 +32,6 @@ CORE_SOURCE_FILES = [ 'src/core/ext/filters/client_channel/dynamic_filters.cc', 'src/core/ext/filters/client_channel/global_subchannel_pool.cc', 'src/core/ext/filters/client_channel/http_proxy_mapper.cc', - 'src/core/ext/filters/client_channel/lb_policy/address_filtering.cc', - 'src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc', - 'src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', - 'src/core/ext/filters/client_channel/lb_policy/health_check_client.cc', - 'src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc', - 'src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', - 'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc', - 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc', - 'src/core/ext/filters/client_channel/lb_policy/rls/rls.cc', - 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc', - 'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/cds.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc', - 'src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc', 'src/core/ext/filters/client_channel/local_subchannel_pool.cc', 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', @@ -696,8 +672,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/json/json_reader.cc', 'src/core/lib/json/json_util.cc', 'src/core/lib/json/json_writer.cc', - 'src/core/lib/load_balancing/lb_policy.cc', - 'src/core/lib/load_balancing/lb_policy_registry.cc', 'src/core/lib/matchers/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', @@ -830,6 +804,32 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', 'src/core/lib/uri/uri_parser.cc', + 'src/core/load_balancing/address_filtering.cc', + 'src/core/load_balancing/child_policy_handler.cc', + 'src/core/load_balancing/endpoint_list.cc', + 'src/core/load_balancing/grpclb/client_load_reporting_filter.cc', + 'src/core/load_balancing/grpclb/grpclb.cc', + 'src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc', + 'src/core/load_balancing/grpclb/grpclb_client_stats.cc', + 'src/core/load_balancing/grpclb/load_balancer_api.cc', + 'src/core/load_balancing/health_check_client.cc', + 'src/core/load_balancing/lb_policy.cc', + 'src/core/load_balancing/lb_policy_registry.cc', + 'src/core/load_balancing/oob_backend_metric.cc', + 'src/core/load_balancing/outlier_detection/outlier_detection.cc', + 'src/core/load_balancing/pick_first/pick_first.cc', + 'src/core/load_balancing/priority/priority.cc', + 'src/core/load_balancing/ring_hash/ring_hash.cc', + 'src/core/load_balancing/rls/rls.cc', + 'src/core/load_balancing/round_robin/round_robin.cc', + 'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc', + 'src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc', + 'src/core/load_balancing/weighted_target/weighted_target.cc', + 'src/core/load_balancing/xds/cds.cc', + 'src/core/load_balancing/xds/xds_cluster_impl.cc', + 'src/core/load_balancing/xds/xds_cluster_manager.cc', + 'src/core/load_balancing/xds/xds_override_host.cc', + 'src/core/load_balancing/xds/xds_wrr_locality.cc', 'src/core/plugin_registry/grpc_plugin_registry.cc', 'src/core/plugin_registry/grpc_plugin_registry_extra.cc', 'src/core/tsi/alts/crypt/aes_gcm.cc', diff --git a/src/python/grpcio_observability/make_grpcio_observability.py b/src/python/grpcio_observability/make_grpcio_observability.py index 9d6e4a2d654..740cdfffc4a 100755 --- a/src/python/grpcio_observability/make_grpcio_observability.py +++ b/src/python/grpcio_observability/make_grpcio_observability.py @@ -68,8 +68,8 @@ COPY_FILES_SOURCE_TARGET_PAIRS = [ ("third_party/abseil-cpp/absl", "third_party/abseil-cpp/absl"), ("src/core/lib", "grpc_root/src/core/lib"), ( - "src/core/ext/filters/client_channel/lb_policy", - "grpc_root/src/core/ext/filters/client_channel/lb_policy", + "src/core/load_balancing", + "grpc_root/src/core/load_balancing", ), ] diff --git a/test/core/client_channel/lb_policy/lb_policy_test_lib.h b/test/core/client_channel/lb_policy/lb_policy_test_lib.h index 48f97ca9524..9b0224a4b69 100644 --- a/test/core/client_channel/lb_policy/lb_policy_test_lib.h +++ b/test/core/client_channel/lb_policy/lb_policy_test_lib.h @@ -55,10 +55,6 @@ #include #include "src/core/ext/filters/client_channel/client_channel_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" -#include "src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h" -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h" -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h" #include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/lib/address_utils/parse_address.h" @@ -77,14 +73,18 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/uri/uri_parser.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/health_check_client_internal.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/oob_backend_metric.h" +#include "src/core/load_balancing/oob_backend_metric_internal.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/client_channel/lb_policy/outlier_detection_test.cc b/test/core/client_channel/lb_policy/outlier_detection_test.cc index 809941ea1f2..45515cf4e69 100644 --- a/test/core/client_channel/lb_policy/outlier_detection_test.cc +++ b/test/core/client_channel/lb_policy/outlier_detection_test.cc @@ -35,14 +35,14 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/lb_policy.h" #include "test/core/client_channel/lb_policy/lb_policy_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/lb_policy/pick_first_test.cc b/test/core/client_channel/lb_policy/pick_first_test.cc index c0424a49c54..bcb4aa935a6 100644 --- a/test/core/client_channel/lb_policy/pick_first_test.cc +++ b/test/core/client_channel/lb_policy/pick_first_test.cc @@ -43,8 +43,8 @@ #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/lb_policy.h" #include "test/core/client_channel/lb_policy/lb_policy_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/lb_policy/ring_hash_test.cc b/test/core/client_channel/lb_policy/ring_hash_test.cc index b911f98c3f7..c7e2ae09a92 100644 --- a/test/core/client_channel/lb_policy/ring_hash_test.cc +++ b/test/core/client_channel/lb_policy/ring_hash_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h" +#include "src/core/load_balancing/ring_hash/ring_hash.h" #include @@ -37,8 +37,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/xxhash_inline.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/lb_policy.h" #include "test/core/client_channel/lb_policy/lb_policy_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/lb_policy/static_stride_scheduler_benchmark.cc b/test/core/client_channel/lb_policy/static_stride_scheduler_benchmark.cc index 8979272b7d2..ef434d14275 100644 --- a/test/core/client_channel/lb_policy/static_stride_scheduler_benchmark.cc +++ b/test/core/client_channel/lb_policy/static_stride_scheduler_benchmark.cc @@ -28,8 +28,8 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h" #include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" namespace grpc_core { namespace { diff --git a/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc b/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc index 63340b9caa0..16e871fb272 100644 --- a/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc +++ b/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h" +#include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" #include #include diff --git a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc index a3efc6d62e2..489e9a9eadf 100644 --- a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc +++ b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc @@ -40,7 +40,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" @@ -48,8 +47,9 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/lb_policy.h" #include "test/core/client_channel/lb_policy/lb_policy_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc index fcf77ef8674..0a6ff47767c 100644 --- a/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc +++ b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc @@ -23,12 +23,12 @@ #include #include "src/core/ext/filters/client_channel/client_channel_service_config.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h" #include "src/core/ext/xds/xds_health_status.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/service_config/service_config.h" #include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/load_balancing/xds/xds_override_host.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/lb_policy/xds_override_host_test.cc b/test/core/client_channel/lb_policy/xds_override_host_test.cc index a255d5639fe..e634ccee399 100644 --- a/test/core/client_channel/lb_policy/xds_override_host_test.cc +++ b/test/core/client_channel/lb_policy/xds_override_host_test.cc @@ -45,8 +45,8 @@ #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/lb_policy.h" #include "test/core/client_channel/lb_policy/lb_policy_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index b711a9aa0b1..8ebe2eac5ce 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -35,8 +35,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/test_lb_policies.h" diff --git a/test/core/util/test_lb_policies.cc b/test/core/util/test_lb_policies.cc index 59f912df13a..0f4f6908e8e 100644 --- a/test/core/util/test_lb_policies.cc +++ b/test/core/util/test_lb_policies.cc @@ -29,7 +29,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -42,12 +41,13 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_util.h" -#include "src/core/lib/load_balancing/delegating_helper.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" -#include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/core/lib/load_balancing/subchannel_interface.h" #include "src/core/lib/uri/uri_parser.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/load_balancing/oob_backend_metric.h" +#include "src/core/load_balancing/subchannel_interface.h" namespace grpc_core { diff --git a/test/core/util/test_lb_policies.h b/test/core/util/test_lb_policies.h index 90e6256b89c..842b4100d06 100644 --- a/test/core/util/test_lb_policies.h +++ b/test/core/util/test_lb_policies.h @@ -28,9 +28,9 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/backend_metric_data.h" namespace grpc_core { diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index d59690dfe18..af8795e00fc 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -35,7 +35,6 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_client.h" @@ -50,6 +49,7 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_writer.h" +#include "src/core/load_balancing/outlier_detection/outlier_detection.h" #include "src/proto/grpc/testing/xds/v3/address.pb.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.pb.h" #include "src/proto/grpc/testing/xds/v3/base.pb.h" diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index 4da93246e3b..ad2230c0cf8 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -41,8 +41,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/load_balancing/lb_policy.h" -#include "src/core/lib/load_balancing/lb_policy_factory.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" #include "src/proto/grpc/testing/xds/v3/extension.pb.h" diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index 28f7a8a79a3..334b187458c 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -37,7 +37,6 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" @@ -47,6 +46,7 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 1d3c865cdb5..2b051aae008 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -43,8 +43,6 @@ #include #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" @@ -58,6 +56,8 @@ #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/load_balancing/grpclb/grpclb.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index 0502d8b7a16..f4f4f5a00d4 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -24,12 +24,12 @@ #include #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/gprpp/env.h" #include "src/core/lib/resolver/endpoint_addresses.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "test/core/util/resolve_localhost_ip46.h" #include "test/core/util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index b66416061d7..b6dde40a810 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -56,7 +56,6 @@ #include #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/ext/xds/xds_api.h" @@ -84,6 +83,7 @@ #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc index 825642f7195..4e1eca12ff1 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -30,11 +30,11 @@ #include #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/gprpp/env.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/pick_first.pb.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index 9ad79d1507f..6ce5076be59 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -25,11 +25,11 @@ #include #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/gprpp/env.h" +#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "test/core/util/resolve_localhost_ip46.h" diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index aba646ec55b..44401c290f0 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/load_balancing/grpclb/load_balancer_api.h" #include "src/proto/grpc/lb/v1/load_balancer.pb.h" // C++ version #include "test/core/util/test_config.h" diff --git a/test/cpp/interop/backend_metrics_lb_policy.cc b/test/cpp/interop/backend_metrics_lb_policy.cc index 30f3bb18943..cbe64559c72 100644 --- a/test/cpp/interop/backend_metrics_lb_policy.cc +++ b/test/cpp/interop/backend_metrics_lb_policy.cc @@ -22,9 +22,9 @@ #include "absl/strings/str_format.h" -#include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h" #include "src/core/lib/iomgr/pollset_set.h" -#include "src/core/lib/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/oob_backend_metric.h" namespace grpc { namespace testing { diff --git a/test/cpp/interop/rpc_behavior_lb_policy.cc b/test/cpp/interop/rpc_behavior_lb_policy.cc index 5067038bc51..9a7398789f6 100644 --- a/test/cpp/interop/rpc_behavior_lb_policy.cc +++ b/test/cpp/interop/rpc_behavior_lb_policy.cc @@ -25,7 +25,7 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/load_balancing/delegating_helper.h" +#include "src/core/load_balancing/delegating_helper.h" namespace grpc { namespace testing { diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 96dcfedf039..6505c0b0977 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -41,7 +41,6 @@ #include #include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -62,6 +61,7 @@ #include "src/core/lib/resolver/endpoint_addresses.h" #include "src/core/lib/resolver/resolver.h" #include "src/core/lib/resolver/resolver_registry.h" +#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "test/core/util/fake_udp_and_tcp_server.h" #include "test/core/util/port.h" #include "test/core/util/socket_use_after_close_detector.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 72c4c872253..70c8d9c1a39 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1115,50 +1115,6 @@ src/core/ext/filters/client_channel/global_subchannel_pool.cc \ src/core/ext/filters/client_channel/global_subchannel_pool.h \ src/core/ext/filters/client_channel/http_proxy_mapper.cc \ src/core/ext/filters/client_channel/http_proxy_mapper.h \ -src/core/ext/filters/client_channel/lb_policy/address_filtering.cc \ -src/core/ext/filters/client_channel/lb_policy/address_filtering.h \ -src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h \ -src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc \ -src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h \ -src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc \ -src/core/ext/filters/client_channel/lb_policy/endpoint_list.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h \ -src/core/ext/filters/client_channel/lb_policy/health_check_client.cc \ -src/core/ext/filters/client_channel/lb_policy/health_check_client.h \ -src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h \ -src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc \ -src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h \ -src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h \ -src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc \ -src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h \ -src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \ -src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h \ -src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \ -src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc \ -src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h \ -src/core/ext/filters/client_channel/lb_policy/rls/rls.cc \ -src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \ -src/core/ext/filters/client_channel/lb_policy/subchannel_list.h \ -src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc \ -src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h \ -src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc \ -src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.h \ src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \ @@ -2650,13 +2606,6 @@ src/core/lib/json/json_util.cc \ src/core/lib/json/json_util.h \ src/core/lib/json/json_writer.cc \ src/core/lib/json/json_writer.h \ -src/core/lib/load_balancing/delegating_helper.h \ -src/core/lib/load_balancing/lb_policy.cc \ -src/core/lib/load_balancing/lb_policy.h \ -src/core/lib/load_balancing/lb_policy_factory.h \ -src/core/lib/load_balancing/lb_policy_registry.cc \ -src/core/lib/load_balancing/lb_policy_registry.h \ -src/core/lib/load_balancing/subchannel_interface.h \ src/core/lib/matchers/matchers.cc \ src/core/lib/matchers/matchers.h \ src/core/lib/promise/activity.cc \ @@ -2945,6 +2894,57 @@ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ src/core/lib/uri/uri_parser.cc \ src/core/lib/uri/uri_parser.h \ +src/core/load_balancing/address_filtering.cc \ +src/core/load_balancing/address_filtering.h \ +src/core/load_balancing/backend_metric_data.h \ +src/core/load_balancing/child_policy_handler.cc \ +src/core/load_balancing/child_policy_handler.h \ +src/core/load_balancing/delegating_helper.h \ +src/core/load_balancing/endpoint_list.cc \ +src/core/load_balancing/endpoint_list.h \ +src/core/load_balancing/grpclb/client_load_reporting_filter.cc \ +src/core/load_balancing/grpclb/client_load_reporting_filter.h \ +src/core/load_balancing/grpclb/grpclb.cc \ +src/core/load_balancing/grpclb/grpclb.h \ +src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc \ +src/core/load_balancing/grpclb/grpclb_balancer_addresses.h \ +src/core/load_balancing/grpclb/grpclb_client_stats.cc \ +src/core/load_balancing/grpclb/grpclb_client_stats.h \ +src/core/load_balancing/grpclb/load_balancer_api.cc \ +src/core/load_balancing/grpclb/load_balancer_api.h \ +src/core/load_balancing/health_check_client.cc \ +src/core/load_balancing/health_check_client.h \ +src/core/load_balancing/health_check_client_internal.h \ +src/core/load_balancing/lb_policy.cc \ +src/core/load_balancing/lb_policy.h \ +src/core/load_balancing/lb_policy_factory.h \ +src/core/load_balancing/lb_policy_registry.cc \ +src/core/load_balancing/lb_policy_registry.h \ +src/core/load_balancing/oob_backend_metric.cc \ +src/core/load_balancing/oob_backend_metric.h \ +src/core/load_balancing/oob_backend_metric_internal.h \ +src/core/load_balancing/outlier_detection/outlier_detection.cc \ +src/core/load_balancing/outlier_detection/outlier_detection.h \ +src/core/load_balancing/pick_first/pick_first.cc \ +src/core/load_balancing/pick_first/pick_first.h \ +src/core/load_balancing/priority/priority.cc \ +src/core/load_balancing/ring_hash/ring_hash.cc \ +src/core/load_balancing/ring_hash/ring_hash.h \ +src/core/load_balancing/rls/rls.cc \ +src/core/load_balancing/round_robin/round_robin.cc \ +src/core/load_balancing/subchannel_interface.h \ +src/core/load_balancing/subchannel_list.h \ +src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc \ +src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h \ +src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc \ +src/core/load_balancing/weighted_target/weighted_target.cc \ +src/core/load_balancing/xds/cds.cc \ +src/core/load_balancing/xds/xds_channel_args.h \ +src/core/load_balancing/xds/xds_cluster_impl.cc \ +src/core/load_balancing/xds/xds_cluster_manager.cc \ +src/core/load_balancing/xds/xds_override_host.cc \ +src/core/load_balancing/xds/xds_override_host.h \ +src/core/load_balancing/xds/xds_wrr_locality.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/plugin_registry/grpc_plugin_registry_extra.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index a6963aa893d..022958293f7 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -920,50 +920,6 @@ src/core/ext/filters/client_channel/global_subchannel_pool.cc \ src/core/ext/filters/client_channel/global_subchannel_pool.h \ src/core/ext/filters/client_channel/http_proxy_mapper.cc \ src/core/ext/filters/client_channel/http_proxy_mapper.h \ -src/core/ext/filters/client_channel/lb_policy/address_filtering.cc \ -src/core/ext/filters/client_channel/lb_policy/address_filtering.h \ -src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h \ -src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc \ -src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h \ -src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc \ -src/core/ext/filters/client_channel/lb_policy/endpoint_list.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h \ -src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \ -src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h \ -src/core/ext/filters/client_channel/lb_policy/health_check_client.cc \ -src/core/ext/filters/client_channel/lb_policy/health_check_client.h \ -src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h \ -src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc \ -src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h \ -src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h \ -src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc \ -src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h \ -src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \ -src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h \ -src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \ -src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc \ -src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h \ -src/core/ext/filters/client_channel/lb_policy/rls/rls.cc \ -src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \ -src/core/ext/filters/client_channel/lb_policy/subchannel_list.h \ -src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc \ -src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h \ -src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc \ -src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h \ -src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.cc \ src/core/ext/filters/client_channel/local_subchannel_pool.h \ src/core/ext/filters/client_channel/resolver/README.md \ @@ -2429,13 +2385,6 @@ src/core/lib/json/json_util.cc \ src/core/lib/json/json_util.h \ src/core/lib/json/json_writer.cc \ src/core/lib/json/json_writer.h \ -src/core/lib/load_balancing/delegating_helper.h \ -src/core/lib/load_balancing/lb_policy.cc \ -src/core/lib/load_balancing/lb_policy.h \ -src/core/lib/load_balancing/lb_policy_factory.h \ -src/core/lib/load_balancing/lb_policy_registry.cc \ -src/core/lib/load_balancing/lb_policy_registry.h \ -src/core/lib/load_balancing/subchannel_interface.h \ src/core/lib/matchers/matchers.cc \ src/core/lib/matchers/matchers.h \ src/core/lib/promise/activity.cc \ @@ -2726,6 +2675,57 @@ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ src/core/lib/uri/uri_parser.cc \ src/core/lib/uri/uri_parser.h \ +src/core/load_balancing/address_filtering.cc \ +src/core/load_balancing/address_filtering.h \ +src/core/load_balancing/backend_metric_data.h \ +src/core/load_balancing/child_policy_handler.cc \ +src/core/load_balancing/child_policy_handler.h \ +src/core/load_balancing/delegating_helper.h \ +src/core/load_balancing/endpoint_list.cc \ +src/core/load_balancing/endpoint_list.h \ +src/core/load_balancing/grpclb/client_load_reporting_filter.cc \ +src/core/load_balancing/grpclb/client_load_reporting_filter.h \ +src/core/load_balancing/grpclb/grpclb.cc \ +src/core/load_balancing/grpclb/grpclb.h \ +src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc \ +src/core/load_balancing/grpclb/grpclb_balancer_addresses.h \ +src/core/load_balancing/grpclb/grpclb_client_stats.cc \ +src/core/load_balancing/grpclb/grpclb_client_stats.h \ +src/core/load_balancing/grpclb/load_balancer_api.cc \ +src/core/load_balancing/grpclb/load_balancer_api.h \ +src/core/load_balancing/health_check_client.cc \ +src/core/load_balancing/health_check_client.h \ +src/core/load_balancing/health_check_client_internal.h \ +src/core/load_balancing/lb_policy.cc \ +src/core/load_balancing/lb_policy.h \ +src/core/load_balancing/lb_policy_factory.h \ +src/core/load_balancing/lb_policy_registry.cc \ +src/core/load_balancing/lb_policy_registry.h \ +src/core/load_balancing/oob_backend_metric.cc \ +src/core/load_balancing/oob_backend_metric.h \ +src/core/load_balancing/oob_backend_metric_internal.h \ +src/core/load_balancing/outlier_detection/outlier_detection.cc \ +src/core/load_balancing/outlier_detection/outlier_detection.h \ +src/core/load_balancing/pick_first/pick_first.cc \ +src/core/load_balancing/pick_first/pick_first.h \ +src/core/load_balancing/priority/priority.cc \ +src/core/load_balancing/ring_hash/ring_hash.cc \ +src/core/load_balancing/ring_hash/ring_hash.h \ +src/core/load_balancing/rls/rls.cc \ +src/core/load_balancing/round_robin/round_robin.cc \ +src/core/load_balancing/subchannel_interface.h \ +src/core/load_balancing/subchannel_list.h \ +src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc \ +src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h \ +src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc \ +src/core/load_balancing/weighted_target/weighted_target.cc \ +src/core/load_balancing/xds/cds.cc \ +src/core/load_balancing/xds/xds_channel_args.h \ +src/core/load_balancing/xds/xds_cluster_impl.cc \ +src/core/load_balancing/xds/xds_cluster_manager.cc \ +src/core/load_balancing/xds/xds_override_host.cc \ +src/core/load_balancing/xds/xds_override_host.h \ +src/core/load_balancing/xds/xds_wrr_locality.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/plugin_registry/grpc_plugin_registry_extra.cc \ src/core/tsi/README.md \ diff --git a/tools/run_tests/sanity/core_banned_functions.py b/tools/run_tests/sanity/core_banned_functions.py index fbef6563450..7421d3caedb 100755 --- a/tools/run_tests/sanity/core_banned_functions.py +++ b/tools/run_tests/sanity/core_banned_functions.py @@ -76,8 +76,9 @@ BANNED_EXCEPT = { "grpc_slice_unref(": ["src/core/lib/slice/slice.cc"], # std::random_device needs /dev/random which is not available on all linuxes that we support. # Any usage must be optional and opt-in, so that those platforms can use gRPC without problem. + # TODO(roth): Fix these callers to use the absl random library instead. "std::random_device": [ - "src/core/ext/filters/client_channel/lb_policy/rls/rls.cc", + "src/core/load_balancing/rls/rls.cc", "src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc", ], # use 'grpc_core::Crash' instead