Merge branch 'master' into uselogicalthread

.gitallowed

@@ -0,0 +1,2 @@
+# Security tests will contain fake secrets
+test/core/security/**

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Report a bug
 about: Create a report to help us improve
 labels: kind/bug, priority/P2
-assignees: nicolasnoble 
+assignees: yashykt 
 
 ---
 

.github/ISSUE_TEMPLATE/cleanup_request.md

@@ -2,7 +2,7 @@
 name: Request a cleanup
 about: Suggest a cleanup in our repository
 labels: kind/internal cleanup, priority/P2
-assignees: nicolasnoble 
+assignees: yashykt 
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Request a feature
 about: Suggest an idea for this project
 labels: kind/enhancement, priority/P2
-assignees: nicolasnoble 
+assignees: yashykt 
 
 ---
 

.github/pull_request_template.md

@@ -8,4 +8,4 @@ If you know who should review your pull request, please remove the mentioning be
 
 -->
 
-@nicolasnoble
+@yashykt

.gitmodules

@@ -30,7 +30,8 @@
 	url = https://github.com/google/bloaty.git
 [submodule "third_party/abseil-cpp"]
 	path = third_party/abseil-cpp
-	url = https://github.com/abseil/abseil-cpp
+	url = https://github.com/abseil/abseil-cpp.git
+	branch = lts_2020_02_25
 [submodule "third_party/envoy-api"]
 	path = third_party/envoy-api
 	url = https://github.com/envoyproxy/data-plane-api.git

BUILD

@@ -75,11 +75,11 @@ config_setting(
 python_config_settings()
 
 # This should be updated along with build.yaml
-g_stands_for = "galactic"
+g_stands_for = "gringotts"
 
 core_version = "9.0.0"
 
-version = "1.28.0-dev"
+version = "1.29.0-dev"
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",
@@ -2259,12 +2259,16 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "grpc++_test",
+    srcs = [
+        "src/cpp/client/channel_test_peer.cc",
+    ],
     public_hdrs = [
         "include/grpc++/test/mock_stream.h",
         "include/grpc++/test/server_context_test_spouse.h",
+        "include/grpcpp/test/channel_test_peer.h",
+        "include/grpcpp/test/default_reactor_test_peer.h",
         "include/grpcpp/test/mock_stream.h",
         "include/grpcpp/test/server_context_test_spouse.h",
-        "include/grpcpp/test/default_reactor_test_peer.h",
     ],
     deps = [
         ":grpc++",

BUILD.gn

@@ -60,11 +60,19 @@ config("grpc_config") {
         "include/grpc/impl/codegen/atm_gcc_atomic.h",
         "include/grpc/impl/codegen/atm_gcc_sync.h",
         "include/grpc/impl/codegen/atm_windows.h",
+        "include/grpc/impl/codegen/byte_buffer.h",
+        "include/grpc/impl/codegen/byte_buffer_reader.h",
+        "include/grpc/impl/codegen/compression_types.h",
+        "include/grpc/impl/codegen/connectivity_state.h",
         "include/grpc/impl/codegen/fork.h",
         "include/grpc/impl/codegen/gpr_slice.h",
         "include/grpc/impl/codegen/gpr_types.h",
+        "include/grpc/impl/codegen/grpc_types.h",
         "include/grpc/impl/codegen/log.h",
         "include/grpc/impl/codegen/port_platform.h",
+        "include/grpc/impl/codegen/propagation_bits.h",
+        "include/grpc/impl/codegen/slice.h",
+        "include/grpc/impl/codegen/status.h",
         "include/grpc/impl/codegen/sync.h",
         "include/grpc/impl/codegen/sync_abseil.h",
         "include/grpc/impl/codegen/sync_custom.h",
@@ -152,6 +160,7 @@ config("grpc_config") {
         "src/core/lib/gprpp/memory.h",
         "src/core/lib/gprpp/mpscq.cc",
         "src/core/lib/gprpp/mpscq.h",
+        "src/core/lib/gprpp/string_view.h",
         "src/core/lib/gprpp/sync.h",
         "src/core/lib/gprpp/thd.h",
         "src/core/lib/gprpp/thd_posix.cc",
@@ -161,11 +170,9 @@ config("grpc_config") {
         "src/core/lib/profiling/timers.h",
     ]
     deps = [
-        ":absl/container:inlined_vector",
-        ":absl/memory:memory",
-        ":absl/strings:str_format",
         ":absl/strings:strings",
-        ":absl/types:optional",
+        ":absl/strings:str_format",
+        ":absl/memory:memory",
     ]
     
     public_configs = [
@@ -186,29 +193,6 @@ config("grpc_config") {
         "include/grpc/grpc_posix.h",
         "include/grpc/grpc_security.h",
         "include/grpc/grpc_security_constants.h",
-        "include/grpc/impl/codegen/atm.h",
-        "include/grpc/impl/codegen/atm_gcc_atomic.h",
-        "include/grpc/impl/codegen/atm_gcc_sync.h",
-        "include/grpc/impl/codegen/atm_windows.h",
-        "include/grpc/impl/codegen/byte_buffer.h",
-        "include/grpc/impl/codegen/byte_buffer_reader.h",
-        "include/grpc/impl/codegen/compression_types.h",
-        "include/grpc/impl/codegen/connectivity_state.h",
-        "include/grpc/impl/codegen/fork.h",
-        "include/grpc/impl/codegen/gpr_slice.h",
-        "include/grpc/impl/codegen/gpr_types.h",
-        "include/grpc/impl/codegen/grpc_types.h",
-        "include/grpc/impl/codegen/log.h",
-        "include/grpc/impl/codegen/port_platform.h",
-        "include/grpc/impl/codegen/propagation_bits.h",
-        "include/grpc/impl/codegen/slice.h",
-        "include/grpc/impl/codegen/status.h",
-        "include/grpc/impl/codegen/sync.h",
-        "include/grpc/impl/codegen/sync_abseil.h",
-        "include/grpc/impl/codegen/sync_custom.h",
-        "include/grpc/impl/codegen/sync_generic.h",
-        "include/grpc/impl/codegen/sync_posix.h",
-        "include/grpc/impl/codegen/sync_windows.h",
         "include/grpc/load_reporting.h",
         "include/grpc/slice.h",
         "include/grpc/slice_buffer.h",
@@ -541,13 +525,13 @@ config("grpc_config") {
         "src/core/lib/debug/stats_data.h",
         "src/core/lib/debug/trace.cc",
         "src/core/lib/debug/trace.h",
+        "src/core/lib/gprpp/atomic.h",
         "src/core/lib/gprpp/debug_location.h",
         "src/core/lib/gprpp/inlined_vector.h",
         "src/core/lib/gprpp/optional.h",
         "src/core/lib/gprpp/orphanable.h",
         "src/core/lib/gprpp/ref_counted.h",
         "src/core/lib/gprpp/ref_counted_ptr.h",
-        "src/core/lib/gprpp/string_view.h",
         "src/core/lib/http/format_request.cc",
         "src/core/lib/http/format_request.h",
         "src/core/lib/http/httpcli.cc",
@@ -642,9 +626,11 @@ config("grpc_config") {
         "src/core/lib/iomgr/pollset_set_windows.cc",
         "src/core/lib/iomgr/pollset_set_windows.h",
         "src/core/lib/iomgr/pollset_uv.cc",
+        "src/core/lib/iomgr/pollset_uv.h",
         "src/core/lib/iomgr/pollset_windows.cc",
         "src/core/lib/iomgr/pollset_windows.h",
         "src/core/lib/iomgr/port.h",
+        "src/core/lib/iomgr/python_util.h",
         "src/core/lib/iomgr/resolve_address.cc",
         "src/core/lib/iomgr/resolve_address.h",
         "src/core/lib/iomgr/resolve_address_custom.cc",
@@ -703,6 +689,7 @@ config("grpc_config") {
         "src/core/lib/iomgr/timer_custom.cc",
         "src/core/lib/iomgr/timer_custom.h",
         "src/core/lib/iomgr/timer_generic.cc",
+        "src/core/lib/iomgr/timer_generic.h",
         "src/core/lib/iomgr/timer_heap.cc",
         "src/core/lib/iomgr/timer_heap.h",
         "src/core/lib/iomgr/timer_manager.cc",
@@ -936,7 +923,10 @@ config("grpc_config") {
         "//third_party/boringssl",
         "//third_party/zlib",
         ":gpr",
+        ":address_sorting",
         ":upb",
+        ":absl/types:optional",
+        ":absl/container:inlined_vector",
         "//third_party/cares",
         ":address_sorting",
     ]
@@ -981,7 +971,6 @@ config("grpc_config") {
         "include/grpc++/impl/codegen/config.h",
         "include/grpc++/impl/codegen/config_protobuf.h",
         "include/grpc++/impl/codegen/core_codegen.h",
-        "include/grpc++/impl/codegen/core_codegen.h",
         "include/grpc++/impl/codegen/core_codegen_interface.h",
         "include/grpc++/impl/codegen/create_auth_context.h",
         "include/grpc++/impl/codegen/grpc_library.h",
@@ -1032,59 +1021,6 @@ config("grpc_config") {
         "include/grpc++/support/stub_options.h",
         "include/grpc++/support/sync_stream.h",
         "include/grpc++/support/time.h",
-        "include/grpc/byte_buffer.h",
-        "include/grpc/byte_buffer_reader.h",
-        "include/grpc/compression.h",
-        "include/grpc/fork.h",
-        "include/grpc/grpc.h",
-        "include/grpc/grpc_posix.h",
-        "include/grpc/grpc_security_constants.h",
-        "include/grpc/impl/codegen/atm.h",
-        "include/grpc/impl/codegen/atm_gcc_atomic.h",
-        "include/grpc/impl/codegen/atm_gcc_sync.h",
-        "include/grpc/impl/codegen/atm_windows.h",
-        "include/grpc/impl/codegen/byte_buffer.h",
-        "include/grpc/impl/codegen/byte_buffer_reader.h",
-        "include/grpc/impl/codegen/compression_types.h",
-        "include/grpc/impl/codegen/connectivity_state.h",
-        "include/grpc/impl/codegen/fork.h",
-        "include/grpc/impl/codegen/gpr_slice.h",
-        "include/grpc/impl/codegen/gpr_types.h",
-        "include/grpc/impl/codegen/grpc_types.h",
-        "include/grpc/impl/codegen/log.h",
-        "include/grpc/impl/codegen/port_platform.h",
-        "include/grpc/impl/codegen/propagation_bits.h",
-        "include/grpc/impl/codegen/slice.h",
-        "include/grpc/impl/codegen/status.h",
-        "include/grpc/impl/codegen/sync.h",
-        "include/grpc/impl/codegen/sync_abseil.h",
-        "include/grpc/impl/codegen/sync_custom.h",
-        "include/grpc/impl/codegen/sync_generic.h",
-        "include/grpc/impl/codegen/sync_posix.h",
-        "include/grpc/impl/codegen/sync_windows.h",
-        "include/grpc/load_reporting.h",
-        "include/grpc/slice.h",
-        "include/grpc/slice_buffer.h",
-        "include/grpc/status.h",
-        "include/grpc/support/alloc.h",
-        "include/grpc/support/atm.h",
-        "include/grpc/support/atm_gcc_atomic.h",
-        "include/grpc/support/atm_gcc_sync.h",
-        "include/grpc/support/atm_windows.h",
-        "include/grpc/support/cpu.h",
-        "include/grpc/support/log.h",
-        "include/grpc/support/log_windows.h",
-        "include/grpc/support/port_platform.h",
-        "include/grpc/support/string_util.h",
-        "include/grpc/support/sync.h",
-        "include/grpc/support/sync_abseil.h",
-        "include/grpc/support/sync_custom.h",
-        "include/grpc/support/sync_generic.h",
-        "include/grpc/support/sync_posix.h",
-        "include/grpc/support/sync_windows.h",
-        "include/grpc/support/thd_id.h",
-        "include/grpc/support/time.h",
-        "include/grpc/support/workaround_list.h",
         "include/grpcpp/alarm.h",
         "include/grpcpp/alarm_impl.h",
         "include/grpcpp/channel.h",
@@ -1130,7 +1066,6 @@ config("grpc_config") {
         "include/grpcpp/impl/codegen/config.h",
         "include/grpcpp/impl/codegen/config_protobuf.h",
         "include/grpcpp/impl/codegen/core_codegen.h",
-        "include/grpcpp/impl/codegen/core_codegen.h",
         "include/grpcpp/impl/codegen/core_codegen_interface.h",
         "include/grpcpp/impl/codegen/create_auth_context.h",
         "include/grpcpp/impl/codegen/delegating_channel.h",
@@ -1207,6 +1142,7 @@ config("grpc_config") {
         "include/grpcpp/support/config.h",
         "include/grpcpp/support/interceptor.h",
         "include/grpcpp/support/message_allocator.h",
+        "include/grpcpp/support/method_handler.h",
         "include/grpcpp/support/proto_buffer_reader.h",
         "include/grpcpp/support/proto_buffer_writer.h",
         "include/grpcpp/support/server_callback.h",
@@ -1221,181 +1157,6 @@ config("grpc_config") {
         "include/grpcpp/support/sync_stream_impl.h",
         "include/grpcpp/support/time.h",
         "include/grpcpp/support/validate_service_config.h",
-        "src/core/ext/transport/inproc/inproc_transport.h",
-        "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h",
-        "src/core/lib/avl/avl.h",
-        "src/core/lib/backoff/backoff.h",
-        "src/core/lib/channel/channel_args.h",
-        "src/core/lib/channel/channel_stack.h",
-        "src/core/lib/channel/channel_stack_builder.h",
-        "src/core/lib/channel/channel_trace.h",
-        "src/core/lib/channel/channelz.h",
-        "src/core/lib/channel/channelz_registry.h",
-        "src/core/lib/channel/connected_channel.h",
-        "src/core/lib/channel/context.h",
-        "src/core/lib/channel/handshaker.h",
-        "src/core/lib/channel/handshaker_factory.h",
-        "src/core/lib/channel/handshaker_registry.h",
-        "src/core/lib/channel/status_util.h",
-        "src/core/lib/compression/algorithm_metadata.h",
-        "src/core/lib/compression/compression_args.h",
-        "src/core/lib/compression/compression_internal.h",
-        "src/core/lib/compression/message_compress.h",
-        "src/core/lib/compression/stream_compression.h",
-        "src/core/lib/compression/stream_compression_gzip.h",
-        "src/core/lib/compression/stream_compression_identity.h",
-        "src/core/lib/debug/stats.h",
-        "src/core/lib/debug/stats_data.h",
-        "src/core/lib/debug/trace.h",
-        "src/core/lib/gpr/alloc.h",
-        "src/core/lib/gpr/arena.h",
-        "src/core/lib/gpr/env.h",
-        "src/core/lib/gpr/murmur_hash.h",
-        "src/core/lib/gpr/spinlock.h",
-        "src/core/lib/gpr/string.h",
-        "src/core/lib/gpr/string_windows.h",
-        "src/core/lib/gpr/time_precise.h",
-        "src/core/lib/gpr/tls.h",
-        "src/core/lib/gpr/tls_gcc.h",
-        "src/core/lib/gpr/tls_msvc.h",
-        "src/core/lib/gpr/tls_pthread.h",
-        "src/core/lib/gpr/tmpfile.h",
-        "src/core/lib/gpr/useful.h",
-        "src/core/lib/gprpp/arena.h",
-        "src/core/lib/gprpp/atomic.h",
-        "src/core/lib/gprpp/debug_location.h",
-        "src/core/lib/gprpp/fork.h",
-        "src/core/lib/gprpp/global_config.h",
-        "src/core/lib/gprpp/global_config_custom.h",
-        "src/core/lib/gprpp/global_config_env.h",
-        "src/core/lib/gprpp/global_config_generic.h",
-        "src/core/lib/gprpp/host_port.h",
-        "src/core/lib/gprpp/inlined_vector.h",
-        "src/core/lib/gprpp/manual_constructor.h",
-        "src/core/lib/gprpp/map.h",
-        "src/core/lib/gprpp/memory.h",
-        "src/core/lib/gprpp/mpscq.h",
-        "src/core/lib/gprpp/optional.h",
-        "src/core/lib/gprpp/orphanable.h",
-        "src/core/lib/gprpp/ref_counted.h",
-        "src/core/lib/gprpp/ref_counted_ptr.h",
-        "src/core/lib/gprpp/string_view.h",
-        "src/core/lib/gprpp/sync.h",
-        "src/core/lib/gprpp/thd.h",
-        "src/core/lib/http/format_request.h",
-        "src/core/lib/http/httpcli.h",
-        "src/core/lib/http/parser.h",
-        "src/core/lib/iomgr/block_annotate.h",
-        "src/core/lib/iomgr/buffer_list.h",
-        "src/core/lib/iomgr/call_combiner.h",
-        "src/core/lib/iomgr/cfstream_handle.h",
-        "src/core/lib/iomgr/closure.h",
-        "src/core/lib/iomgr/combiner.h",
-        "src/core/lib/iomgr/dynamic_annotations.h",
-        "src/core/lib/iomgr/endpoint.h",
-        "src/core/lib/iomgr/endpoint_cfstream.h",
-        "src/core/lib/iomgr/endpoint_pair.h",
-        "src/core/lib/iomgr/error.h",
-        "src/core/lib/iomgr/error_cfstream.h",
-        "src/core/lib/iomgr/error_internal.h",
-        "src/core/lib/iomgr/ev_epoll1_linux.h",
-        "src/core/lib/iomgr/ev_epollex_linux.h",
-        "src/core/lib/iomgr/ev_poll_posix.h",
-        "src/core/lib/iomgr/ev_posix.h",
-        "src/core/lib/iomgr/exec_ctx.h",
-        "src/core/lib/iomgr/executor.h",
-        "src/core/lib/iomgr/executor/mpmcqueue.h",
-        "src/core/lib/iomgr/executor/threadpool.h",
-        "src/core/lib/iomgr/gethostname.h",
-        "src/core/lib/iomgr/grpc_if_nametoindex.h",
-        "src/core/lib/iomgr/internal_errqueue.h",
-        "src/core/lib/iomgr/iocp_windows.h",
-        "src/core/lib/iomgr/iomgr.h",
-        "src/core/lib/iomgr/iomgr_custom.h",
-        "src/core/lib/iomgr/iomgr_internal.h",
-        "src/core/lib/iomgr/iomgr_posix.h",
-        "src/core/lib/iomgr/is_epollexclusive_available.h",
-        "src/core/lib/iomgr/load_file.h",
-        "src/core/lib/iomgr/lockfree_event.h",
-        "src/core/lib/iomgr/nameser.h",
-        "src/core/lib/iomgr/poller/eventmanager_libuv.h",
-        "src/core/lib/iomgr/polling_entity.h",
-        "src/core/lib/iomgr/pollset.h",
-        "src/core/lib/iomgr/pollset_custom.h",
-        "src/core/lib/iomgr/pollset_set.h",
-        "src/core/lib/iomgr/pollset_set_custom.h",
-        "src/core/lib/iomgr/pollset_set_windows.h",
-        "src/core/lib/iomgr/pollset_windows.h",
-        "src/core/lib/iomgr/port.h",
-        "src/core/lib/iomgr/resolve_address.h",
-        "src/core/lib/iomgr/resolve_address_custom.h",
-        "src/core/lib/iomgr/resource_quota.h",
-        "src/core/lib/iomgr/sockaddr.h",
-        "src/core/lib/iomgr/sockaddr_custom.h",
-        "src/core/lib/iomgr/sockaddr_posix.h",
-        "src/core/lib/iomgr/sockaddr_utils.h",
-        "src/core/lib/iomgr/sockaddr_windows.h",
-        "src/core/lib/iomgr/socket_factory_posix.h",
-        "src/core/lib/iomgr/socket_mutator.h",
-        "src/core/lib/iomgr/socket_utils.h",
-        "src/core/lib/iomgr/socket_utils_posix.h",
-        "src/core/lib/iomgr/socket_windows.h",
-        "src/core/lib/iomgr/sys_epoll_wrapper.h",
-        "src/core/lib/iomgr/tcp_client.h",
-        "src/core/lib/iomgr/tcp_client_posix.h",
-        "src/core/lib/iomgr/tcp_custom.h",
-        "src/core/lib/iomgr/tcp_posix.h",
-        "src/core/lib/iomgr/tcp_server.h",
-        "src/core/lib/iomgr/tcp_server_utils_posix.h",
-        "src/core/lib/iomgr/tcp_windows.h",
-        "src/core/lib/iomgr/time_averaged_stats.h",
-        "src/core/lib/iomgr/timer.h",
-        "src/core/lib/iomgr/timer_custom.h",
-        "src/core/lib/iomgr/timer_heap.h",
-        "src/core/lib/iomgr/timer_manager.h",
-        "src/core/lib/iomgr/udp_server.h",
-        "src/core/lib/iomgr/unix_sockets_posix.h",
-        "src/core/lib/iomgr/wakeup_fd_pipe.h",
-        "src/core/lib/iomgr/wakeup_fd_posix.h",
-        "src/core/lib/iomgr/work_serializer.h",
-        "src/core/lib/json/json.h",
-        "src/core/lib/profiling/timers.h",
-        "src/core/lib/slice/b64.h",
-        "src/core/lib/slice/percent_encoding.h",
-        "src/core/lib/slice/slice_hash_table.h",
-        "src/core/lib/slice/slice_internal.h",
-        "src/core/lib/slice/slice_string_helpers.h",
-        "src/core/lib/slice/slice_utils.h",
-        "src/core/lib/slice/slice_weak_hash_table.h",
-        "src/core/lib/surface/api_trace.h",
-        "src/core/lib/surface/call.h",
-        "src/core/lib/surface/call_test_only.h",
-        "src/core/lib/surface/channel.h",
-        "src/core/lib/surface/channel_init.h",
-        "src/core/lib/surface/channel_stack_type.h",
-        "src/core/lib/surface/completion_queue.h",
-        "src/core/lib/surface/completion_queue_factory.h",
-        "src/core/lib/surface/event_string.h",
-        "src/core/lib/surface/init.h",
-        "src/core/lib/surface/lame_client.h",
-        "src/core/lib/surface/server.h",
-        "src/core/lib/surface/validate_metadata.h",
-        "src/core/lib/transport/bdp_estimator.h",
-        "src/core/lib/transport/byte_stream.h",
-        "src/core/lib/transport/connectivity_state.h",
-        "src/core/lib/transport/error_utils.h",
-        "src/core/lib/transport/http2_errors.h",
-        "src/core/lib/transport/metadata.h",
-        "src/core/lib/transport/metadata_batch.h",
-        "src/core/lib/transport/pid_controller.h",
-        "src/core/lib/transport/static_metadata.h",
-        "src/core/lib/transport/status_conversion.h",
-        "src/core/lib/transport/status_metadata.h",
-        "src/core/lib/transport/timeout_encoding.h",
-        "src/core/lib/transport/transport.h",
-        "src/core/lib/transport/transport_impl.h",
-        "src/core/lib/uri/uri_parser.h",
         "src/cpp/client/channel_cc.cc",
         "src/cpp/client/client_context.cc",
         "src/cpp/client/client_interceptor.cc",
@@ -1455,10 +1216,10 @@ config("grpc_config") {
         "src/cpp/util/time_cc.cc",
     ]
     deps = [
-        "//third_party/boringssl",
         "//third_party/protobuf:protobuf_lite",
         ":grpc",
         ":gpr",
+        ":address_sorting",
         ":upb",
     ]
     
@@ -1480,6 +1241,7 @@ config("grpc_config") {
         "src/compiler/cpp_generator.cc",
         "src/compiler/cpp_generator.h",
         "src/compiler/cpp_generator_helpers.h",
+        "src/compiler/cpp_plugin.h",
         "src/compiler/csharp_generator.cc",
         "src/compiler/csharp_generator.h",
         "src/compiler/csharp_generator_helpers.h",

MAINTAINERS.md

@@ -57,6 +57,7 @@ for general contribution guidelines.
 - [yang-g](https://github.com/yang-g), Google LLC
 - [yashykt](https://github.com/yashykt), Google LLC
 - [yihuazhang](https://github.com/yihuazhang), Google LLC
+- [ZhenLian](https://github.com/ZhenLian), Google LLC
 - [ZhouyihaiDing](https://github.com/ZhouyihaiDing), Google LLC
 
 

Rakefile

@@ -7,8 +7,6 @@ require 'fileutils'
 
 require_relative 'build_config.rb'
 
-load 'tools/distrib/docker_for_windows.rb'
-
 # Add rubocop style checking tasks
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.options = ['-c', 'src/ruby/.rubocop.yml']
@@ -83,12 +81,14 @@ end
 
 desc 'Build the Windows gRPC DLLs for Ruby'
 task 'dlls' do
+  require 'rake_compiler_dock'
+
   grpc_config = ENV['GRPC_CONFIG'] || 'opt'
   verbose = ENV['V'] || '0'
 
   env = 'CPPFLAGS="-D_WIN32_WINNT=0x600 -DNTDDI_VERSION=0x06000000 -DUNICODE -D_UNICODE -Wno-unused-variable -Wno-unused-result -DCARES_STATICLIB -Wno-error=conversion -Wno-sign-compare -Wno-parentheses -Wno-format -DWIN32_LEAN_AND_MEAN" '
   env += 'CFLAGS="-Wno-incompatible-pointer-types" '
-  env += 'CXXFLAGS="-std=c++11" '
+  env += 'CXXFLAGS="-std=c++11 -fno-exceptions" '
   env += 'LDFLAGS=-static '
   env += 'SYSTEM=MINGW32 '
   env += 'EMBED_ZLIB=true '
@@ -98,15 +98,20 @@ task 'dlls' do
   env += "V=#{verbose} "
   out = GrpcBuildConfig::CORE_WINDOWS_DLL
 
-  w64 = { cross: 'x86_64-w64-mingw32', out: 'grpc_c.64.ruby' }
-  w32 = { cross: 'i686-w64-mingw32', out: 'grpc_c.32.ruby' }
+  w64 = { cross: 'x86_64-w64-mingw32', out: 'grpc_c.64.ruby', platform: 'x64-mingw32' }
+  w32 = { cross: 'i686-w64-mingw32', out: 'grpc_c.32.ruby', platform: 'x86-mingw32' }
 
   [ w64, w32 ].each do |opt|
     env_comp = "CC=#{opt[:cross]}-gcc "
     env_comp += "CXX=#{opt[:cross]}-g++ "
     env_comp += "LD=#{opt[:cross]}-gcc "
     env_comp += "LDXX=#{opt[:cross]}-g++ "
-    docker_for_windows "gem update --system --no-document && #{env} #{env_comp} make -j #{out} && #{opt[:cross]}-strip -x -S #{out} && cp #{out} #{opt[:out]}"
+    RakeCompilerDock.sh <<-EOT, platform: opt[:platform]
+      gem update --system --no-document && \
+      #{env} #{env_comp} make -j`nproc` #{out} && \
+      #{opt[:cross]}-strip -x -S #{out} && \
+      cp #{out} #{opt[:out]}
+    EOT
   end
 
 end
@@ -127,8 +132,22 @@ task 'gem:native' do
     end
     system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
   else
+    require 'rake_compiler_dock'
+
     Rake::Task['dlls'].execute
-    docker_for_windows "gem update --system --no-document && bundle && rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
+    ['x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux'].each do |plat|
+      RakeCompilerDock.sh <<-EOT, platform: plat
+        # Avoid conflicting declarations of gettimeofday: https://github.com/rake-compiler/rake-compiler-dock/issues/32
+        find /usr/local/rake-compiler -name win32.h | while read f ; do sudo sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done && \
+
+        gem update --system --no-document && \
+        bundle && \
+        rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem \
+          RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 \
+          V=#{verbose} \
+          GRPC_CONFIG=#{grpc_config}
+      EOT
+    end
   end
 end
 

bazel/grpc_build_system.bzl

@@ -221,7 +221,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
             )
     else:
         # the test behavior doesn't depend on polling, just generate the test
-        native.cc_test(name = name, tags = tags, **args)
+        native.cc_test(name = name, tags = tags + ["no_uses_polling"], **args)
     ios_cc_test(
         name = name,
         tags = tags,

bazel/grpc_deps.bzl

@@ -197,9 +197,9 @@ def grpc_deps():
     if "com_google_absl" not in native.existing_rules():
         http_archive(
             name = "com_google_absl",
-            sha256 = "19391fb4882601a65cb648d638c11aa301ce5f525ef02da1a9eafd22f72d7c59",
-            strip_prefix = "abseil-cpp-37dd2562ec830d547a1524bb306be313ac3f2556",
-            url = "https://github.com/abseil/abseil-cpp/archive/37dd2562ec830d547a1524bb306be313ac3f2556.tar.gz",
+            sha256 = "c14b840dc57926b8b671805426a82249e5ea0d7fddf709fd4619eb38cbb36fb5",
+            strip_prefix = "abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7",
+            url = "https://github.com/abseil/abseil-cpp/archive/b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz",
         )
 
     if "bazel_toolchains" not in native.existing_rules():

build_handwritten.yaml

@@ -0,0 +1,263 @@
+'#1': This file describes the list of targets and dependencies.
+'#2': It is used among other things to generate all of our project files.
+'#3': Please refer to the templates directory for more information.
+settings:
+  '#01': The public version number of the library.
+  '#02': ===
+  '#03': Please update the 'g_stands_for' field periodically with a new g word
+  '#04': not listed in doc/g_stands_for.md - and update that document to list the
+  '#05': new word. When doing so, please also update BUILD.
+  '#06': ===
+  '#07': Master always has a "-dev" suffix
+  '#08': Use "-preN" suffixes to identify pre-release versions
+  '#09': Per-language overrides are possible with (eg) ruby_version tag here
+  '#10': See the expand_version.py for all the quirks here
+  core_version: 9.0.0
+  csharp_major_version: 2
+  g_stands_for: gringotts
+  version: 1.29.0-dev
+targets:
+- name: check_epollexclusive
+  build: tool
+  language: c
+  src:
+  - test/build/check_epollexclusive.c
+  deps:
+  - grpc
+  - gpr
+- name: gen_hpack_tables
+  build: tool
+  language: c++
+  src:
+  - tools/codegen/core/gen_hpack_tables.cc
+  deps:
+  - grpc
+  - gpr
+  uses_polling: false
+- name: gen_legal_metadata_characters
+  build: tool
+  language: c++
+  src:
+  - tools/codegen/core/gen_legal_metadata_characters.cc
+  deps: []
+- name: gen_percent_encoding_tables
+  build: tool
+  language: c++
+  src:
+  - tools/codegen/core/gen_percent_encoding_tables.cc
+  deps: []
+  uses_polling: false
+vspackages:
+- linkage: static
+  name: grpc.dependencies.zlib
+  props: false
+  redist: true
+  version: 1.2.8.10
+- linkage: static
+  name: grpc.dependencies.openssl
+  props: true
+  redist: true
+  version: 1.0.204.1
+- name: gflags
+  props: false
+  redist: false
+  version: 2.1.2.1
+- name: gtest
+  props: false
+  redist: false
+  version: 1.7.0.1
+configs:
+  asan:
+    CC: clang
+    CPPFLAGS: -O0 -fsanitize-coverage=edge,trace-pc-guard -fsanitize=address -fno-omit-frame-pointer
+      -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
+    CXX: clang++
+    LD: clang++
+    LDFLAGS: -fsanitize=address
+    LDXX: clang++
+    compile_the_world: true
+    test_environ:
+      ASAN_OPTIONS: detect_leaks=1:color=always
+      LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
+  asan-noleaks:
+    CC: clang
+    CPPFLAGS: -O0 -fsanitize-coverage=edge,trace-pc-guard -fsanitize=address -fno-omit-frame-pointer
+      -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
+    CXX: clang++
+    LD: clang++
+    LDFLAGS: fsanitize=address
+    LDXX: clang++
+    compile_the_world: true
+    test_environ:
+      ASAN_OPTIONS: detect_leaks=0:color=always
+  asan-trace-cmp:
+    CC: clang
+    CPPFLAGS: -O0 -fsanitize-coverage=edge,trace-pc-guard -fsanitize-coverage=trace-cmp
+      -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument
+      -DGPR_NO_DIRECT_SYSCALLS
+    CXX: clang++
+    LD: clang++
+    LDFLAGS: -fsanitize=address
+    LDXX: clang++
+    compile_the_world: true
+    test_environ:
+      ASAN_OPTIONS: detect_leaks=1:color=always
+      LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
+  basicprof:
+    CPPFLAGS: -O2 -DGRPC_BASIC_PROFILER -DGRPC_TIMERS_RDTSC
+    DEFINES: NDEBUG
+  c++-compat:
+    CFLAGS: -Wc++-compat
+    CPPFLAGS: -O0
+    DEFINES: _DEBUG DEBUG
+  counters:
+    CPPFLAGS: -O2 -DGPR_LOW_LEVEL_COUNTERS
+    DEFINES: NDEBUG
+  counters_with_memory_counter:
+    CPPFLAGS: -O2 -DGPR_LOW_LEVEL_COUNTERS -DGPR_WRAP_MEMORY_COUNTER
+    DEFINES: NDEBUG
+    LDFLAGS: -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=free
+  dbg:
+    CPPFLAGS: -O0
+    DEFINES: _DEBUG DEBUG
+  gcov:
+    CC: gcc
+    CPPFLAGS: -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
+    CXX: g++
+    DEFINES: _DEBUG DEBUG GPR_GCOV
+    LD: gcc
+    LDFLAGS: -fprofile-arcs -ftest-coverage -rdynamic -lstdc++
+    LDXX: g++
+  helgrind:
+    CPPFLAGS: -O0
+    DEFINES: _DEBUG DEBUG
+    LDFLAGS: -rdynamic
+    valgrind: --tool=helgrind
+  lto:
+    CPPFLAGS: -O2
+    DEFINES: NDEBUG
+  memcheck:
+    CPPFLAGS: -O0
+    DEFINES: _DEBUG DEBUG
+    LDFLAGS: -rdynamic
+    valgrind: --tool=memcheck --leak-check=full
+  msan:
+    CC: clang
+    CPPFLAGS: -O0 -stdlib=libc++ -fsanitize-coverage=edge,trace-pc-guard -fsanitize=memory
+      -fsanitize-memory-track-origins -fsanitize-memory-use-after-dtor -fno-omit-frame-pointer
+      -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument
+      -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
+    CXX: clang++
+    DEFINES: NDEBUG
+    LD: clang++
+    LDFLAGS: -stdlib=libc++ -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1
+      -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
+    LDXX: clang++
+    compile_the_world: true
+    test_environ:
+      MSAN_OPTIONS: poison_in_dtor=1
+  mutrace:
+    CPPFLAGS: -O3 -fno-omit-frame-pointer
+    DEFINES: NDEBUG
+    LDFLAGS: -rdynamic
+  noexcept:
+    CPPFLAGS: -O2 -Wframe-larger-than=16384
+    CXXFLAGS: -fno-exceptions
+    DEFINES: NDEBUG
+  opt:
+    CPPFLAGS: -O2 -Wframe-larger-than=16384
+    DEFINES: NDEBUG
+  stapprof:
+    CPPFLAGS: -O2 -DGRPC_STAP_PROFILER
+    DEFINES: NDEBUG
+  tsan:
+    CC: clang
+    CPPFLAGS: -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument
+      -DGPR_NO_DIRECT_SYSCALLS
+    CXX: clang++
+    DEFINES: GRPC_TSAN
+    LD: clang++
+    LDFLAGS: -fsanitize=thread
+    LDXX: clang++
+    compile_the_world: true
+    test_environ:
+      TSAN_OPTIONS: suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
+  ubsan:
+    CC: clang
+    CPPFLAGS: -O0 -stdlib=libc++ -fsanitize-coverage=edge,trace-pc-guard -fsanitize=undefined
+      -fno-omit-frame-pointer -Wno-unused-command-line-argument -Wvarargs
+    CXX: clang++
+    DEFINES: NDEBUG GRPC_UBSAN
+    LD: clang++
+    LDFLAGS: -stdlib=libc++ -fsanitize=undefined,unsigned-integer-overflow
+    LDXX: clang++
+    compile_the_world: true
+    test_environ:
+      UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
+defaults:
+  ares:
+    CFLAGS: -g
+    CPPFLAGS: -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE
+      $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst
+      FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux)
+      $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN
+      -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
+  benchmark:
+    CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
+  boringssl:
+    CFLAGS: -g
+    CPPFLAGS: -Ithird_party/boringssl-with-bazel/src/include -fvisibility=hidden -DOPENSSL_NO_ASM
+      -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
+    CXXFLAGS: -fno-exceptions
+  global:
+    CFLAGS: -g
+    COREFLAGS: -fno-exceptions
+    CPPFLAGS: -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/upb
+      -Isrc/core/ext/upb-generated
+    LDFLAGS: -g
+  zlib:
+    CFLAGS: -fvisibility=hidden
+php_config_m4:
+  deps:
+  - grpc
+  - address_sorting
+  - boringssl
+  - z
+  headers:
+  - src/php/ext/grpc/byte_buffer.h
+  - src/php/ext/grpc/call.h
+  - src/php/ext/grpc/call_credentials.h
+  - src/php/ext/grpc/channel.h
+  - src/php/ext/grpc/channel_credentials.h
+  - src/php/ext/grpc/completion_queue.h
+  - src/php/ext/grpc/php7_wrapper.h
+  - src/php/ext/grpc/php_grpc.h
+  - src/php/ext/grpc/server.h
+  - src/php/ext/grpc/server_credentials.h
+  - src/php/ext/grpc/timeval.h
+  - src/php/ext/grpc/version.h
+  src:
+  - src/php/ext/grpc/byte_buffer.c
+  - src/php/ext/grpc/call.c
+  - src/php/ext/grpc/call_credentials.c
+  - src/php/ext/grpc/channel.c
+  - src/php/ext/grpc/channel_credentials.c
+  - src/php/ext/grpc/completion_queue.c
+  - src/php/ext/grpc/php_grpc.c
+  - src/php/ext/grpc/server.c
+  - src/php/ext/grpc/server_credentials.c
+  - src/php/ext/grpc/timeval.c
+python_dependencies:
+  deps:
+  - grpc
+  - address_sorting
+  - ares
+  - boringssl
+  - z
+ruby_gem:
+  deps:
+  - grpc
+  - address_sorting
+  - ares
+  - boringssl
+  - z

doc/g_stands_for.md

@@ -27,4 +27,5 @@
 - 1.25 'g' stands for ['game'](https://github.com/grpc/grpc/tree/v1.25.x)
 - 1.26 'g' stands for ['gon'](https://github.com/grpc/grpc/tree/v1.26.x)
 - 1.27 'g' stands for ['guantao'](https://github.com/grpc/grpc/tree/v1.27.x)
-- 1.28 'g' stands for ['galactic'](https://github.com/grpc/grpc/tree/master)
+- 1.28 'g' stands for ['galactic'](https://github.com/grpc/grpc/tree/v1.28.x)
+- 1.29 'g' stands for ['gringotts'](https://github.com/grpc/grpc/tree/master)

gRPC-C++.podspec

@@ -22,7 +22,7 @@
 Pod::Spec.new do |s|
   s.name     = 'gRPC-C++'
   # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  version = '1.28.0-dev'
+  version = '1.29.0-dev'
   s.version  = version
   s.summary  = 'gRPC C++ library'
   s.homepage = 'https://grpc.io'
@@ -193,6 +193,7 @@ Pod::Spec.new do |s|
                       'include/grpcpp/support/config.h',
                       'include/grpcpp/support/interceptor.h',
                       'include/grpcpp/support/message_allocator.h',
+                      'include/grpcpp/support/method_handler.h',
                       'include/grpcpp/support/proto_buffer_reader.h',
                       'include/grpcpp/support/proto_buffer_writer.h',
                       'include/grpcpp/support/server_callback.h',
@@ -213,15 +214,14 @@ Pod::Spec.new do |s|
     ss.header_mappings_dir = '.'
     ss.dependency "#{s.name}/Interface", version
     ss.dependency 'gRPC-Core', version
-    abseil_version = '0.20190808.1'
+    abseil_version = '0.20200225.0'
     ss.dependency 'abseil/container/inlined_vector', abseil_version
     ss.dependency 'abseil/memory/memory', abseil_version
     ss.dependency 'abseil/strings/str_format', abseil_version
     ss.dependency 'abseil/strings/strings', abseil_version
     ss.dependency 'abseil/types/optional', abseil_version
 
-    ss.source_files = 'include/grpcpp/impl/codegen/core_codegen.h',
-                      'src/core/ext/filters/client_channel/backend_metric.h',
+    ss.source_files = 'src/core/ext/filters/client_channel/backend_metric.h',
                       'src/core/ext/filters/client_channel/backup_poller.h',
                       'src/core/ext/filters/client_channel/client_channel.h',
                       'src/core/ext/filters/client_channel/client_channel_channelz.h',
@@ -453,8 +453,10 @@ Pod::Spec.new do |s|
                       'src/core/lib/iomgr/pollset_set.h',
                       'src/core/lib/iomgr/pollset_set_custom.h',
                       'src/core/lib/iomgr/pollset_set_windows.h',
+                      'src/core/lib/iomgr/pollset_uv.h',
                       'src/core/lib/iomgr/pollset_windows.h',
                       'src/core/lib/iomgr/port.h',
+                      'src/core/lib/iomgr/python_util.h',
                       'src/core/lib/iomgr/resolve_address.h',
                       'src/core/lib/iomgr/resolve_address_custom.h',
                       'src/core/lib/iomgr/resource_quota.h',
@@ -479,6 +481,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/iomgr/time_averaged_stats.h',
                       'src/core/lib/iomgr/timer.h',
                       'src/core/lib/iomgr/timer_custom.h',
+                      'src/core/lib/iomgr/timer_generic.h',
                       'src/core/lib/iomgr/timer_heap.h',
                       'src/core/lib/iomgr/timer_manager.h',
                       'src/core/lib/iomgr/udp_server.h',
@@ -651,8 +654,7 @@ Pod::Spec.new do |s|
                       'third_party/upb/upb/table.int.h',
                       'third_party/upb/upb/upb.h'
 
-    ss.private_header_files = 'include/grpcpp/impl/codegen/core_codegen.h',
-                              'src/core/ext/filters/client_channel/backend_metric.h',
+    ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h',
                               'src/core/ext/filters/client_channel/backup_poller.h',
                               'src/core/ext/filters/client_channel/client_channel.h',
                               'src/core/ext/filters/client_channel/client_channel_channelz.h',
@@ -884,8 +886,10 @@ Pod::Spec.new do |s|
                               'src/core/lib/iomgr/pollset_set.h',
                               'src/core/lib/iomgr/pollset_set_custom.h',
                               'src/core/lib/iomgr/pollset_set_windows.h',
+                              'src/core/lib/iomgr/pollset_uv.h',
                               'src/core/lib/iomgr/pollset_windows.h',
                               'src/core/lib/iomgr/port.h',
+                              'src/core/lib/iomgr/python_util.h',
                               'src/core/lib/iomgr/resolve_address.h',
                               'src/core/lib/iomgr/resolve_address_custom.h',
                               'src/core/lib/iomgr/resource_quota.h',
@@ -910,6 +914,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/iomgr/time_averaged_stats.h',
                               'src/core/lib/iomgr/timer.h',
                               'src/core/lib/iomgr/timer_custom.h',
+                              'src/core/lib/iomgr/timer_generic.h',
                               'src/core/lib/iomgr/timer_heap.h',
                               'src/core/lib/iomgr/timer_manager.h',
                               'src/core/lib/iomgr/udp_server.h',
@@ -1066,6 +1071,7 @@ Pod::Spec.new do |s|
   end
 
   s.prepare_command = <<-END_OF_COMMAND
+    sed -E -i '' 's;#include <openssl/(.*)>;#if COCOAPODS==1\\\n  #include <openssl_grpc/\\1>\\\n#else\\\n  #include <openssl/\\1>\\\n#endif;g' $(find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print | xargs grep -H -c '#include <openssl_grpc/' | grep 0$ | cut -d':' -f1)
     find src/core/ third_party/upb/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "upb/(.*)";#if COCOAPODS==1\\\n  #include  "third_party/upb/upb/\\1"\\\n#else\\\n  #include  "upb/\\1"\\\n#endif;g'
     find src/core/ third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
     find src/core/ src/cpp/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "src/core/ext/upb-generated/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'

gRPC-Core.podspec

@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-Core'
-  version = '1.28.0-dev'
+  version = '1.29.0-dev'
   s.version  = version
   s.summary  = 'Core cross-platform gRPC library, written in C'
   s.homepage = 'https://grpc.io'
@@ -173,7 +173,7 @@ Pod::Spec.new do |s|
     ss.libraries = 'z'
     ss.dependency "#{s.name}/Interface", version
     ss.dependency 'BoringSSL-GRPC', '0.0.7'
-    abseil_version = '0.20190808.1'
+    abseil_version = '0.20200225.0'
     ss.dependency 'abseil/container/inlined_vector', abseil_version
     ss.dependency 'abseil/memory/memory', abseil_version
     ss.dependency 'abseil/strings/str_format', abseil_version
@@ -676,9 +676,11 @@ Pod::Spec.new do |s|
                       'src/core/lib/iomgr/pollset_set_windows.cc',
                       'src/core/lib/iomgr/pollset_set_windows.h',
                       'src/core/lib/iomgr/pollset_uv.cc',
+                      'src/core/lib/iomgr/pollset_uv.h',
                       'src/core/lib/iomgr/pollset_windows.cc',
                       'src/core/lib/iomgr/pollset_windows.h',
                       'src/core/lib/iomgr/port.h',
+                      'src/core/lib/iomgr/python_util.h',
                       'src/core/lib/iomgr/resolve_address.cc',
                       'src/core/lib/iomgr/resolve_address.h',
                       'src/core/lib/iomgr/resolve_address_custom.cc',
@@ -737,6 +739,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/iomgr/timer_custom.cc',
                       'src/core/lib/iomgr/timer_custom.h',
                       'src/core/lib/iomgr/timer_generic.cc',
+                      'src/core/lib/iomgr/timer_generic.h',
                       'src/core/lib/iomgr/timer_heap.cc',
                       'src/core/lib/iomgr/timer_heap.h',
                       'src/core/lib/iomgr/timer_manager.cc',
@@ -1214,8 +1217,10 @@ Pod::Spec.new do |s|
                               'src/core/lib/iomgr/pollset_set.h',
                               'src/core/lib/iomgr/pollset_set_custom.h',
                               'src/core/lib/iomgr/pollset_set_windows.h',
+                              'src/core/lib/iomgr/pollset_uv.h',
                               'src/core/lib/iomgr/pollset_windows.h',
                               'src/core/lib/iomgr/port.h',
+                              'src/core/lib/iomgr/python_util.h',
                               'src/core/lib/iomgr/resolve_address.h',
                               'src/core/lib/iomgr/resolve_address_custom.h',
                               'src/core/lib/iomgr/resource_quota.h',
@@ -1240,6 +1245,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/iomgr/time_averaged_stats.h',
                               'src/core/lib/iomgr/timer.h',
                               'src/core/lib/iomgr/timer_custom.h',
+                              'src/core/lib/iomgr/timer_generic.h',
                               'src/core/lib/iomgr/timer_heap.h',
                               'src/core/lib/iomgr/timer_manager.h',
                               'src/core/lib/iomgr/udp_server.h',
@@ -1481,10 +1487,6 @@ Pod::Spec.new do |s|
                       'test/core/end2end/tests/workaround_cronet_compression.cc',
                       'test/core/end2end/tests/write_buffering.cc',
                       'test/core/end2end/tests/write_buffering_at_end.cc',
-                      'test/core/iomgr/endpoint_tests.cc',
-                      'test/core/iomgr/endpoint_tests.h',
-                      'test/core/security/oauth2_utils.cc',
-                      'test/core/security/oauth2_utils.h',
                       'test/core/util/cmdline.cc',
                       'test/core/util/cmdline.h',
                       'test/core/util/debugger_macros.cc',
@@ -1508,14 +1510,16 @@ Pod::Spec.new do |s|
                       'test/core/util/port_isolated_runtime_environment.cc',
                       'test/core/util/port_server_client.cc',
                       'test/core/util/port_server_client.h',
+                      'test/core/util/reconnect_server.cc',
+                      'test/core/util/reconnect_server.h',
                       'test/core/util/slice_splitter.cc',
                       'test/core/util/slice_splitter.h',
                       'test/core/util/subprocess.h',
                       'test/core/util/subprocess_windows.cc',
                       'test/core/util/test_config.cc',
                       'test/core/util/test_config.h',
-                      'test/core/util/test_lb_policies.cc',
-                      'test/core/util/test_lb_policies.h',
+                      'test/core/util/test_tcp_server.cc',
+                      'test/core/util/test_tcp_server.h',
                       'test/core/util/tracer_util.cc',
                       'test/core/util/tracer_util.h',
                       'test/core/util/trickle_endpoint.cc',

gRPC-ProtoRPC.podspec

@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-ProtoRPC'
-  version = '1.28.0-dev'
+  version = '1.29.0-dev'
   s.version  = version
   s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
   s.homepage = 'https://grpc.io'

gRPC-RxLibrary.podspec

@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-RxLibrary'
-  version = '1.28.0-dev'
+  version = '1.29.0-dev'
   s.version  = version
   s.summary  = 'Reactive Extensions library for iOS/OSX.'
   s.homepage = 'https://grpc.io'

gRPC.podspec

@@ -20,7 +20,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC'
-  version = '1.28.0-dev'
+  version = '1.29.0-dev'
   s.version  = version
   s.summary  = 'gRPC client library for iOS/OSX'
   s.homepage = 'https://grpc.io'

grpc.gemspec

@@ -19,7 +19,10 @@ Gem::Specification.new do |s|
   s.files += %w( etc/roots.pem )
   s.files += Dir.glob('src/ruby/bin/**/*')
   s.files += Dir.glob('src/ruby/ext/**/*')
-  s.files += Dir.glob('src/ruby/lib/**/*')
+  s.files += Dir.glob('src/ruby/lib/**/*').reject do |f|
+    # Binaries are included by rake-compiler and would lead to circular dependencies here
+    File.fnmatch("**/?.?/grpc_c.so", f)
+  end
   s.files += Dir.glob('src/ruby/pb/**/*').reject do |f|
     f.match(%r{^src/ruby/pb/test})
   end
@@ -36,9 +39,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'facter',             '~> 2.4'
   s.add_development_dependency 'logging',            '~> 2.0'
   s.add_development_dependency 'simplecov',          '~> 0.14.1'
-  s.add_development_dependency 'rake',               '~> 12.0'
-  s.add_development_dependency 'rake-compiler',      '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1'
+  s.add_development_dependency 'rake',               '~> 13.0'
+  s.add_development_dependency 'rake-compiler',      '~> 1.1'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
   s.add_development_dependency 'rspec',              '~> 3.6'
   s.add_development_dependency 'rubocop',            '~> 0.49.1'
   s.add_development_dependency 'signet',             '~> 0.7'
@@ -596,9 +599,11 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/iomgr/pollset_set_windows.cc )
   s.files += %w( src/core/lib/iomgr/pollset_set_windows.h )
   s.files += %w( src/core/lib/iomgr/pollset_uv.cc )
+  s.files += %w( src/core/lib/iomgr/pollset_uv.h )
   s.files += %w( src/core/lib/iomgr/pollset_windows.cc )
   s.files += %w( src/core/lib/iomgr/pollset_windows.h )
   s.files += %w( src/core/lib/iomgr/port.h )
+  s.files += %w( src/core/lib/iomgr/python_util.h )
   s.files += %w( src/core/lib/iomgr/resolve_address.cc )
   s.files += %w( src/core/lib/iomgr/resolve_address.h )
   s.files += %w( src/core/lib/iomgr/resolve_address_custom.cc )
@@ -657,6 +662,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/iomgr/timer_custom.cc )
   s.files += %w( src/core/lib/iomgr/timer_custom.h )
   s.files += %w( src/core/lib/iomgr/timer_generic.cc )
+  s.files += %w( src/core/lib/iomgr/timer_generic.h )
   s.files += %w( src/core/lib/iomgr/timer_heap.cc )
   s.files += %w( src/core/lib/iomgr/timer_heap.h )
   s.files += %w( src/core/lib/iomgr/timer_manager.cc )
@@ -901,6 +907,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/base/internal/cycleclock.cc )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/cycleclock.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/endian.h )
+  s.files += %w( third_party/abseil-cpp/absl/base/internal/errno_saver.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/hide_ptr.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/identity.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/inline_variable.h )

include/grpc/grpc.h

@@ -225,8 +225,8 @@ GRPCAPI void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq,
                                void* tag, void* reserved);
 
 /** Pre-register a method/host pair on a channel.
-    method and host are not owned and must remain alive while the server is
-    running. */
+    method and host are not owned and must remain alive while the channel is
+    alive. */
 GRPCAPI void* grpc_channel_register_call(grpc_channel* channel,
                                          const char* method, const char* host,
                                          void* reserved);

include/grpc/module.modulemap

@@ -2,77 +2,62 @@
 framework module grpc {
   umbrella header "grpc.h"
 
-  header "support/alloc.h"
-  header "support/atm.h"
-  header "support/cpu.h"
-  header "support/log.h"
-  header "support/log_windows.h"
-  header "support/port_platform.h"
-  header "support/string_util.h"
-  header "support/sync.h"
-  header "support/sync_abseil.h"
-  header "support/sync_generic.h"
-  header "support/thd_id.h"
-  header "support/time.h"
   header "impl/codegen/atm.h"
-  header "impl/codegen/fork.h"
-  header "impl/codegen/gpr_slice.h"
-  header "impl/codegen/gpr_types.h"
-  header "impl/codegen/log.h"
-  header "impl/codegen/port_platform.h"
-  header "impl/codegen/sync.h"
-  header "impl/codegen/sync_abseil.h"
-  header "impl/codegen/sync_generic.h"
   header "impl/codegen/byte_buffer.h"
   header "impl/codegen/byte_buffer_reader.h"
   header "impl/codegen/compression_types.h"
   header "impl/codegen/connectivity_state.h"
-  header "impl/codegen/grpc_types.h"
-  header "impl/codegen/propagation_bits.h"
-  header "impl/codegen/slice.h"
-  header "impl/codegen/status.h"
-  header "impl/codegen/atm.h"
   header "impl/codegen/fork.h"
   header "impl/codegen/gpr_slice.h"
   header "impl/codegen/gpr_types.h"
+  header "impl/codegen/grpc_types.h"
   header "impl/codegen/log.h"
   header "impl/codegen/port_platform.h"
+  header "impl/codegen/propagation_bits.h"
+  header "impl/codegen/slice.h"
+  header "impl/codegen/status.h"
   header "impl/codegen/sync.h"
   header "impl/codegen/sync_abseil.h"
   header "impl/codegen/sync_generic.h"
-  header "grpc_security.h"
+  header "support/alloc.h"
+  header "support/atm.h"
+  header "support/cpu.h"
+  header "support/log.h"
+  header "support/log_windows.h"
+  header "support/port_platform.h"
+  header "support/string_util.h"
+  header "support/sync.h"
+  header "support/sync_abseil.h"
+  header "support/sync_generic.h"
+  header "support/thd_id.h"
+  header "support/time.h"
   header "byte_buffer.h"
   header "byte_buffer_reader.h"
+  header "census.h"
   header "compression.h"
   header "fork.h"
   header "grpc.h"
   header "grpc_posix.h"
+  header "grpc_security.h"
   header "grpc_security_constants.h"
   header "load_reporting.h"
   header "slice.h"
   header "slice_buffer.h"
   header "status.h"
   header "support/workaround_list.h"
-  header "census.h"
 
-  textual header "support/atm_gcc_atomic.h"
-  textual header "support/atm_gcc_sync.h"
-  textual header "support/atm_windows.h"
-  textual header "support/sync_custom.h"
-  textual header "support/sync_posix.h"
-  textual header "support/sync_windows.h"
-  textual header "impl/codegen/atm_gcc_atomic.h"
-  textual header "impl/codegen/atm_gcc_sync.h"
-  textual header "impl/codegen/atm_windows.h"
-  textual header "impl/codegen/sync_custom.h"
-  textual header "impl/codegen/sync_posix.h"
-  textual header "impl/codegen/sync_windows.h"
   textual header "impl/codegen/atm_gcc_atomic.h"
   textual header "impl/codegen/atm_gcc_sync.h"
   textual header "impl/codegen/atm_windows.h"
   textual header "impl/codegen/sync_custom.h"
   textual header "impl/codegen/sync_posix.h"
   textual header "impl/codegen/sync_windows.h"
+  textual header "support/atm_gcc_atomic.h"
+  textual header "support/atm_gcc_sync.h"
+  textual header "support/atm_windows.h"
+  textual header "support/sync_custom.h"
+  textual header "support/sync_posix.h"
+  textual header "support/sync_windows.h"
 
   export *
   module * { export * }

include/grpcpp/channel_impl.h

@@ -33,6 +33,9 @@
 struct grpc_channel;
 
 namespace grpc {
+namespace testing {
+class ChannelTestPeer;
+}  // namespace testing
 
 std::shared_ptr<::grpc_impl::Channel> CreateChannelInternal(
     const grpc::string& host, grpc_channel* c_channel,
@@ -71,6 +74,7 @@ class Channel final : public ::grpc::ChannelInterface,
  private:
   template <class InputMessage, class OutputMessage>
   friend class ::grpc::internal::BlockingUnaryCallImpl;
+  friend class ::grpc::testing::ChannelTestPeer;
   friend void experimental::ChannelResetConnectionBackoff(Channel* channel);
   friend std::shared_ptr<Channel> grpc::CreateChannelInternal(
       const grpc::string& host, grpc_channel* c_channel,

include/grpcpp/test/channel_test_peer.h

@@ -0,0 +1,44 @@
+/*
+ *
+ * Copyright 2020 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPCPP_TEST_CHANNEL_TEST_PEER_H
+#define GRPCPP_TEST_CHANNEL_TEST_PEER_H
+
+#include <grpcpp/channel.h>
+
+namespace grpc {
+namespace testing {
+
+/// A test-only class to access private members of Channel.
+class ChannelTestPeer {
+ public:
+  explicit ChannelTestPeer(Channel* channel) : channel_(channel) {}
+
+  /// Provide the gRPC Core channel
+  grpc_channel* channel() const { return channel_->c_channel_; }
+  int registered_calls() const;
+  int registration_attempts() const;
+
+ private:
+  Channel* channel_;  // not owned
+};
+
+}  // namespace testing
+}  // namespace grpc
+
+#endif  // GRPCPP_TEST_CHANNEL_TEST_PEER_H

package.xml

@@ -13,8 +13,8 @@
  <date>2019-09-24</date>
  <time>16:06:07</time>
  <version>
-  <release>1.28.0dev</release>
-  <api>1.28.0dev</api>
+  <release>1.29.0dev</release>
+  <api>1.29.0dev</api>
  </version>
  <stability>
   <release>beta</release>
@@ -22,7 +22,7 @@
  </stability>
  <license>Apache 2.0</license>
  <notes>
-- gRPC Core 1.28.0 update
+- gRPC Core 1.29.0 update
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -579,9 +579,11 @@
     <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_uv.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_uv.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_windows.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/port.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/python_util.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address_custom.cc" role="src" />
@@ -640,6 +642,7 @@
     <file baseinstalldir="/" name="src/core/lib/iomgr/timer_custom.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/timer_custom.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/timer_generic.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_generic.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/timer_heap.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/timer_heap.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/timer_manager.cc" role="src" />
@@ -906,6 +909,7 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/cycleclock.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/cycleclock.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/endian.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/errno_saver.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/hide_ptr.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/identity.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/inline_variable.h" role="src" />

src/abseil-cpp/preprocessed_builds.yaml

@@ -17,6 +17,7 @@
 - cmake_target: absl::atomic_hook
   deps:
   - absl/base:config
+  - absl/base:core_headers
   headers:
   - third_party/abseil-cpp/absl/base/internal/atomic_hook.h
   name: absl/base:atomic_hook
@@ -107,6 +108,13 @@
   - third_party/abseil-cpp/absl/base/internal/unaligned_access.h
   name: absl/base:endian
   src: []
+- cmake_target: absl::errno_saver
+  deps:
+  - absl/base:config
+  headers:
+  - third_party/abseil-cpp/absl/base/internal/errno_saver.h
+  name: absl/base:errno_saver
+  src: []
 - cmake_target: absl::exponential_biased
   deps:
   - absl/base:config
@@ -169,6 +177,7 @@
   deps:
   - absl/base:base_internal
   - absl/base:core_headers
+  - absl/base:errno_saver
   headers:
   - third_party/abseil-cpp/absl/base/internal/spinlock_akaros.inc
   - third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
@@ -207,7 +216,7 @@
   - third_party/abseil-cpp/absl/container/internal/btree_container.h
   name: absl/container:btree
   src: []
-- cmake_target: ''
+- cmake_target: absl::container_common
   deps:
   - absl/meta:type_traits
   - absl/types:optional
@@ -416,6 +425,7 @@
   - absl/base:config
   - absl/base:core_headers
   - absl/base:dynamic_annotations
+  - absl/base:errno_saver
   - absl/base:raw_logging_internal
   headers:
   - third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h
@@ -453,6 +463,7 @@
   - absl/base:base
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:errno_saver
   - absl/base:raw_logging_internal
   - absl/debugging:examine_stack
   - absl/debugging:stacktrace
@@ -547,6 +558,7 @@
   - third_party/abseil-cpp/absl/flags/flag.cc
 - cmake_target: absl::flags_internal
   deps:
+  - absl/base:base
   - absl/base:config
   - absl/base:core_headers
   - absl/flags:config
@@ -564,6 +576,7 @@
   deps:
   - absl/base:config
   - absl/base:core_headers
+  - absl/flags:config
   - absl/flags:marshalling
   - absl/strings:strings
   - absl/types:optional
@@ -668,7 +681,7 @@
   name: absl/flags:usage_internal
   src:
   - third_party/abseil-cpp/absl/flags/internal/usage.cc
-- cmake_target: ''
+- cmake_target: absl::bind_front
   deps:
   - absl/base:base_internal
   - absl/container:compressed_tuple
@@ -679,7 +692,7 @@
   - third_party/abseil-cpp/absl/functional/internal/front_binder.h
   name: absl/functional:bind_front
   src: []
-- cmake_target: ''
+- cmake_target: absl::function_ref
   deps:
   - absl/base:base_internal
   - absl/meta:type_traits
@@ -1040,6 +1053,53 @@
   name: absl/random:seed_sequences
   src:
   - third_party/abseil-cpp/absl/random/seed_sequences.cc
+- cmake_target: absl::status
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/base:raw_logging_internal
+  - absl/container:inlined_vector
+  - absl/debugging:stacktrace
+  - absl/debugging:symbolize
+  - absl/strings:cord
+  - absl/strings:str_format
+  - absl/strings:strings
+  - absl/types:optional
+  headers:
+  - third_party/abseil-cpp/absl/status/status.h
+  - third_party/abseil-cpp/absl/status/status_payload_printer.h
+  name: absl/status:status
+  src:
+  - third_party/abseil-cpp/absl/status/status.cc
+  - third_party/abseil-cpp/absl/status/status_payload_printer.cc
+- cmake_target: absl::cord
+  deps:
+  - absl/base:base
+  - absl/base:base_internal
+  - absl/base:core_headers
+  - absl/base:endian
+  - absl/base:raw_logging_internal
+  - absl/container:fixed_array
+  - absl/container:inlined_vector
+  - absl/functional:function_ref
+  - absl/meta:type_traits
+  - absl/strings:cord_internal
+  - absl/strings:internal
+  - absl/strings:str_format
+  - absl/strings:strings
+  headers:
+  - third_party/abseil-cpp/absl/strings/cord.h
+  name: absl/strings:cord
+  src:
+  - third_party/abseil-cpp/absl/strings/cord.cc
+- cmake_target: absl::cord
+  deps:
+  - absl/meta:type_traits
+  - absl/strings:strings
+  headers:
+  - third_party/abseil-cpp/absl/strings/internal/cord_internal.h
+  name: absl/strings:cord_internal
+  src: []
 - cmake_target: absl::strings_internal
   deps:
   - absl/base:config

src/core/ext/filters/client_channel/client_channel.cc

@@ -245,9 +245,9 @@ class ChannelData {
   void DestroyResolvingLoadBalancingPolicyLocked();
 
   static bool ProcessResolverResultLocked(
-      void* arg, const Resolver::Result& result, const char** lb_policy_name,
+      void* arg, const Resolver::Result& result,
       RefCountedPtr<LoadBalancingPolicy::Config>* lb_policy_config,
-      grpc_error** service_config_error);
+      grpc_error** service_config_error, bool* no_valid_service_config);
 
   grpc_error* DoPingLocked(grpc_transport_op* op);
 
@@ -258,7 +258,6 @@ class ChannelData {
   void ProcessLbPolicy(
       const Resolver::Result& resolver_result,
       const internal::ClientChannelGlobalParsedConfig* parsed_service_config,
-      grpc_core::UniquePtr<char>* lb_policy_name,
       RefCountedPtr<LoadBalancingPolicy::Config>* lb_policy_config);
 
   //
@@ -1602,24 +1601,23 @@ void ChannelData::DestroyResolvingLoadBalancingPolicyLocked() {
 void ChannelData::ProcessLbPolicy(
     const Resolver::Result& resolver_result,
     const internal::ClientChannelGlobalParsedConfig* parsed_service_config,
-    grpc_core::UniquePtr<char>* lb_policy_name,
     RefCountedPtr<LoadBalancingPolicy::Config>* lb_policy_config) {
-  // Prefer the LB policy name found in the service config.
+  // Prefer the LB policy config found in the service config.
   if (parsed_service_config != nullptr &&
       parsed_service_config->parsed_lb_config() != nullptr) {
-    lb_policy_name->reset(
-        gpr_strdup(parsed_service_config->parsed_lb_config()->name()));
     *lb_policy_config = parsed_service_config->parsed_lb_config();
     return;
   }
-  const char* local_policy_name = nullptr;
+  // Try the deprecated LB policy name from the service config.
+  // If not, try the setting from channel args.
+  const char* policy_name = nullptr;
   if (parsed_service_config != nullptr &&
       parsed_service_config->parsed_deprecated_lb_policy() != nullptr) {
-    local_policy_name = parsed_service_config->parsed_deprecated_lb_policy();
+    policy_name = parsed_service_config->parsed_deprecated_lb_policy();
   } else {
     const grpc_arg* channel_arg =
         grpc_channel_args_find(resolver_result.args, GRPC_ARG_LB_POLICY_NAME);
-    local_policy_name = grpc_channel_arg_get_string(channel_arg);
+    policy_name = grpc_channel_arg_get_string(channel_arg);
   }
   // Special case: If at least one balancer address is present, we use
   // the grpclb policy, regardless of what the resolver has returned.
@@ -1632,27 +1630,46 @@ void ChannelData::ProcessLbPolicy(
     }
   }
   if (found_balancer_address) {
-    if (local_policy_name != nullptr &&
-        strcmp(local_policy_name, "grpclb") != 0) {
+    if (policy_name != nullptr && strcmp(policy_name, "grpclb") != 0) {
       gpr_log(GPR_INFO,
               "resolver requested LB policy %s but provided at least one "
               "balancer address -- forcing use of grpclb LB policy",
-              local_policy_name);
+              policy_name);
     }
-    local_policy_name = "grpclb";
+    policy_name = "grpclb";
   }
   // Use pick_first if nothing was specified and we didn't select grpclb
   // above.
-  lb_policy_name->reset(gpr_strdup(
-      local_policy_name == nullptr ? "pick_first" : local_policy_name));
+  if (policy_name == nullptr) policy_name = "pick_first";
+  // Now that we have the policy name, construct an empty config for it.
+  Json config_json = Json::Array{Json::Object{
+      {policy_name, Json::Object{}},
+  }};
+  grpc_error* parse_error = GRPC_ERROR_NONE;
+  *lb_policy_config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(
+      config_json, &parse_error);
+  // The policy name came from one of three places:
+  // - The deprecated loadBalancingPolicy field in the service config,
+  //   in which case the code in ClientChannelServiceConfigParser
+  //   already verified that the policy does not require a config.
+  // - One of the hard-coded values here, all of which are known to not
+  //   require a config.
+  // - A channel arg, in which case the application did something that
+  //   is a misuse of our API.
+  // In the first two cases, these assertions will always be true.  In
+  // the last case, this is probably fine for now.
+  // TODO(roth): If the last case becomes a problem, add better error
+  // handling here.
+  GPR_ASSERT(*lb_policy_config != nullptr);
+  GPR_ASSERT(parse_error == GRPC_ERROR_NONE);
 }
 
 // Synchronous callback from ResolvingLoadBalancingPolicy to process a
 // resolver result update.
 bool ChannelData::ProcessResolverResultLocked(
-    void* arg, const Resolver::Result& result, const char** lb_policy_name,
+    void* arg, const Resolver::Result& result,
     RefCountedPtr<LoadBalancingPolicy::Config>* lb_policy_config,
-    grpc_error** service_config_error) {
+    grpc_error** service_config_error, bool* no_valid_service_config) {
   ChannelData* chand = static_cast<ChannelData*>(arg);
   RefCountedPtr<ServiceConfig> service_config;
   // If resolver did not return a service config or returned an invalid service
@@ -1662,13 +1679,13 @@ bool ChannelData::ProcessResolverResultLocked(
     // config. If there is no saved config either, use the default service
     // config.
     if (chand->saved_service_config_ != nullptr) {
-      service_config = chand->saved_service_config_;
       if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) {
         gpr_log(GPR_INFO,
                 "chand=%p: resolver returned invalid service config. "
                 "Continuing to use previous service config.",
                 chand);
       }
+      service_config = chand->saved_service_config_;
     } else if (chand->default_service_config_ != nullptr) {
       if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) {
         gpr_log(GPR_INFO,
@@ -1694,6 +1711,7 @@ bool ChannelData::ProcessResolverResultLocked(
   *service_config_error = GRPC_ERROR_REF(result.service_config_error);
   if (service_config == nullptr &&
       result.service_config_error != GRPC_ERROR_NONE) {
+    *no_valid_service_config = true;
     return false;
   }
   // Process service config.
@@ -1758,19 +1776,18 @@ bool ChannelData::ProcessResolverResultLocked(
     chand->UpdateServiceConfigLocked(std::move(retry_throttle_data),
                                      chand->saved_service_config_);
   }
-  grpc_core::UniquePtr<char> processed_lb_policy_name;
-  chand->ProcessLbPolicy(result, parsed_service_config,
-                         &processed_lb_policy_name, lb_policy_config);
+  chand->ProcessLbPolicy(result, parsed_service_config, lb_policy_config);
+  grpc_core::UniquePtr<char> lb_policy_name(
+      gpr_strdup((*lb_policy_config)->name()));
   // Swap out the data used by GetChannelInfo().
   {
     MutexLock lock(&chand->info_mu_);
-    chand->info_lb_policy_name_ = std::move(processed_lb_policy_name);
+    chand->info_lb_policy_name_ = std::move(lb_policy_name);
     if (service_config_json != nullptr) {
       chand->info_service_config_json_ = std::move(service_config_json);
     }
   }
   // Return results.
-  *lb_policy_name = chand->info_lb_policy_name_.get();
   return service_config_changed;
 }
 

src/core/ext/filters/client_channel/resolving_lb_policy.cc

@@ -267,7 +267,6 @@ void ResolvingLoadBalancingPolicy::OnResolverError(grpc_error* error) {
 }
 
 void ResolvingLoadBalancingPolicy::CreateOrUpdateLbPolicyLocked(
-    const char* lb_policy_name,
     RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config,
     Resolver::Result result, TraceStringVector* trace_strings) {
   // If the child policy name changes, we need to create a new child
@@ -319,6 +318,7 @@ void ResolvingLoadBalancingPolicy::CreateOrUpdateLbPolicyLocked(
   //       that was there before, which will be immediately shut down)
   //       and will later be swapped into child_policy_ by the helper
   //       when the new child transitions into state READY.
+  const char* lb_policy_name = lb_policy_config->name();
   const bool create_policy =
       // case 1
       lb_policy_ == nullptr ||
@@ -450,34 +450,33 @@ void ResolvingLoadBalancingPolicy::OnResolverResultChangedLocked(
   TraceStringVector trace_strings;
   const bool resolution_contains_addresses = result.addresses.size() > 0;
   // Process the resolver result.
-  const char* lb_policy_name = nullptr;
   RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config;
   bool service_config_changed = false;
   char* service_config_error_string = nullptr;
   if (process_resolver_result_ != nullptr) {
     grpc_error* service_config_error = GRPC_ERROR_NONE;
+    bool no_valid_service_config = false;
     service_config_changed = process_resolver_result_(
-        process_resolver_result_user_data_, result, &lb_policy_name,
-        &lb_policy_config, &service_config_error);
+        process_resolver_result_user_data_, result, &lb_policy_config,
+        &service_config_error, &no_valid_service_config);
     if (service_config_error != GRPC_ERROR_NONE) {
       service_config_error_string =
           gpr_strdup(grpc_error_string(service_config_error));
-      if (lb_policy_name == nullptr) {
-        // Use an empty lb_policy_name as an indicator that we received an
-        // invalid service config and we don't have a fallback service config.
+      if (no_valid_service_config) {
+        // We received an invalid service config and we don't have a
+        // fallback service config.
         OnResolverError(service_config_error);
       } else {
         GRPC_ERROR_UNREF(service_config_error);
       }
     }
   } else {
-    lb_policy_name = child_policy_name_.get();
     lb_policy_config = child_lb_config_;
   }
-  if (lb_policy_name != nullptr) {
+  if (lb_policy_config != nullptr) {
     // Create or update LB policy, as needed.
-    CreateOrUpdateLbPolicyLocked(lb_policy_name, lb_policy_config,
-                                 std::move(result), &trace_strings);
+    CreateOrUpdateLbPolicyLocked(std::move(lb_policy_config), std::move(result),
+                                 &trace_strings);
   }
   // Add channel trace event.
   if (service_config_changed) {

src/core/ext/filters/client_channel/resolving_lb_policy.h

@@ -52,16 +52,15 @@ namespace grpc_core {
 class ResolvingLoadBalancingPolicy : public LoadBalancingPolicy {
  public:
   // Synchronous callback that takes the resolver result and sets
-  // lb_policy_name and lb_policy_config to point to the right data.
+  // lb_policy_config to point to the right data.
   // Returns true if the service config has changed since the last result.
-  // If the returned service_config_error is not none and lb_policy_name is
-  // empty, it means that we don't have a valid service config to use, and we
-  // should set the channel to be in TRANSIENT_FAILURE.
+  // If the returned no_valid_service_config is true, that means that we
+  // don't have a valid service config to use, and we should set the channel
+  // to be in TRANSIENT_FAILURE.
   typedef bool (*ProcessResolverResultCallback)(
       void* user_data, const Resolver::Result& result,
-      const char** lb_policy_name,
       RefCountedPtr<LoadBalancingPolicy::Config>* lb_policy_config,
-      grpc_error** service_config_error);
+      grpc_error** service_config_error, bool* no_valid_service_config);
   // If error is set when this returns, then construction failed, and
   // the caller may not use the new object.
   ResolvingLoadBalancingPolicy(
@@ -92,7 +91,6 @@ class ResolvingLoadBalancingPolicy : public LoadBalancingPolicy {
 
   void OnResolverError(grpc_error* error);
   void CreateOrUpdateLbPolicyLocked(
-      const char* lb_policy_name,
       RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config,
       Resolver::Result result, TraceStringVector* trace_strings);
   OrphanablePtr<LoadBalancingPolicy> CreateLbPolicyLocked(

src/core/lib/gprpp/host_port.cc

@@ -48,7 +48,7 @@ namespace {
 bool DoSplitHostPort(StringView name, StringView* host, StringView* port,
                      bool* has_port) {
   *has_port = false;
-  if (name[0] == '[') {
+  if (!name.empty() && name[0] == '[') {
     /* Parse a bracketed host, typically an IPv6 literal. */
     const size_t rbracket = name.find(']', 1);
     if (rbracket == grpc_core::StringView::npos) {

src/core/lib/security/credentials/credentials.h

@@ -56,7 +56,6 @@ typedef enum {
 #define GRPC_CALL_CREDENTIALS_TYPE_COMPOSITE "Composite"
 
 #define GRPC_AUTHORIZATION_METADATA_KEY "authorization"
-#define GRPC_AUTH_QUOTA_PROJECT_METADATA_KEY "x-goog-user-project"
 #define GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY \
   "x-goog-iam-authorization-token"
 #define GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY "x-goog-iam-authority-selector"

src/core/lib/security/credentials/oauth2/oauth2_credentials.cc

@@ -74,9 +74,6 @@ grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json(
   }
   result.type = GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER;
 
-  // quota_project_id is optional, so we don't check the result of the copy.
-  grpc_copy_json_string_property(json, "quota_project_id",
-                                 &result.quota_project_id);
   if (!grpc_copy_json_string_property(json, "client_secret",
                                       &result.client_secret) ||
       !grpc_copy_json_string_property(json, "client_id", &result.client_id) ||
@@ -117,10 +114,6 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token* refresh_token) {
     gpr_free(refresh_token->refresh_token);
     refresh_token->refresh_token = nullptr;
   }
-  if (refresh_token->quota_project_id != nullptr) {
-    gpr_free(refresh_token->quota_project_id);
-    refresh_token->quota_project_id = nullptr;
-  }
 }
 
 //
@@ -283,7 +276,6 @@ bool grpc_oauth2_token_fetcher_credentials::get_request_metadata(
     grpc_polling_entity* pollent, grpc_auth_metadata_context /*context*/,
     grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata,
     grpc_error** /*error*/) {
-  maybe_add_additional_metadata(md_array);
   // Check if we can use the cached token.
   grpc_millis refresh_threshold =
       GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS * GPR_MS_PER_SEC;
@@ -461,17 +453,6 @@ void grpc_google_refresh_token_credentials::fetch_oauth2(
   gpr_free(body);
 }
 
-void grpc_google_refresh_token_credentials::maybe_add_additional_metadata(
-    grpc_credentials_mdelem_array* md_array) {
-  if (refresh_token_.quota_project_id != nullptr) {
-    grpc_mdelem quota_project_md = grpc_mdelem_from_slices(
-        grpc_core::ExternallyManagedSlice(GRPC_AUTH_QUOTA_PROJECT_METADATA_KEY),
-        grpc_core::ExternallyManagedSlice(refresh_token_.quota_project_id));
-    grpc_credentials_mdelem_array_add(md_array, quota_project_md);
-    GRPC_MDELEM_UNREF(quota_project_md);
-  }
-}
-
 grpc_google_refresh_token_credentials::grpc_google_refresh_token_credentials(
     grpc_auth_refresh_token refresh_token)
     : refresh_token_(refresh_token) {}

src/core/lib/security/credentials/oauth2/oauth2_credentials.h

@@ -32,13 +32,12 @@
   "s&subject_token_type=%s"
 
 // auth_refresh_token parsing.
-struct grpc_auth_refresh_token {
+typedef struct {
   const char* type;
   char* client_id;
   char* client_secret;
   char* refresh_token;
-  char* quota_project_id = nullptr;
-};
+} grpc_auth_refresh_token;
 
 /// Returns 1 if the object is valid, 0 otherwise.
 int grpc_auth_refresh_token_is_valid(
@@ -91,9 +90,6 @@ class grpc_oauth2_token_fetcher_credentials : public grpc_call_credentials {
                             grpc_httpcli_context* httpcli_context,
                             grpc_polling_entity* pollent, grpc_iomgr_cb_func cb,
                             grpc_millis deadline) = 0;
-  // Sub class may override this for adding additional metadata other than
-  // credentials itself.
-  virtual void maybe_add_additional_metadata(grpc_credentials_mdelem_array*) {}
 
  private:
   gpr_mu mu_;
@@ -121,8 +117,6 @@ class grpc_google_refresh_token_credentials final
                     grpc_httpcli_context* httpcli_context,
                     grpc_polling_entity* pollent, grpc_iomgr_cb_func cb,
                     grpc_millis deadline) override;
-  void maybe_add_additional_metadata(
-      grpc_credentials_mdelem_array* md_array) override;
 
  private:
   grpc_auth_refresh_token refresh_token_;

src/core/lib/security/transport/client_auth_filter.cc

@@ -165,17 +165,9 @@ static void on_credentials_metadata(void* arg, grpc_error* input_error) {
     grpc_metadata_batch* mdb =
         batch->payload->send_initial_metadata.send_initial_metadata;
     for (size_t i = 0; i < calld->md_array.size; ++i) {
-      // Only add x-goog-user-project header if not present.
-      if (grpc_slice_str_cmp(GRPC_MDKEY(calld->md_array.md[i]),
-                             GRPC_AUTH_QUOTA_PROJECT_METADATA_KEY) == 0) {
-        add_error(&error, grpc_metadata_batch_add_tail_when_key_not_exist(
-                              mdb, &calld->md_links[i],
-                              GRPC_MDELEM_REF(calld->md_array.md[i])));
-      } else {
-        add_error(&error, grpc_metadata_batch_add_tail(
-                              mdb, &calld->md_links[i],
-                              GRPC_MDELEM_REF(calld->md_array.md[i])));
-      }
+      add_error(&error, grpc_metadata_batch_add_tail(
+                            mdb, &calld->md_links[i],
+                            GRPC_MDELEM_REF(calld->md_array.md[i])));
     }
   }
   if (error == GRPC_ERROR_NONE) {

src/core/lib/surface/channel.cc

@@ -54,12 +54,6 @@
  *  (OK, Cancelled, Unknown). */
 #define NUM_CACHED_STATUS_ELEMS 3
 
-typedef struct registered_call {
-  grpc_mdelem path;
-  grpc_mdelem authority;
-  struct registered_call* next;
-} registered_call;
-
 static void destroy_channel(void* arg, grpc_error* error);
 
 grpc_channel* grpc_channel_create_with_builder(
@@ -90,8 +84,7 @@ grpc_channel* grpc_channel_create_with_builder(
   channel->target = target;
   channel->resource_user = resource_user;
   channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
-  gpr_mu_init(&channel->registered_call_mu);
-  channel->registered_calls = nullptr;
+  channel->registration_table.Init();
 
   gpr_atm_no_barrier_store(
       &channel->call_size_estimate,
@@ -417,35 +410,65 @@ grpc_call* grpc_channel_create_pollset_set_call(
       deadline);
 }
 
+namespace grpc_core {
+
+RegisteredCall::RegisteredCall(const char* method, const char* host) {
+  path = grpc_mdelem_from_slices(GRPC_MDSTR_PATH,
+                                 grpc_core::ExternallyManagedSlice(method));
+  authority =
+      host ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY,
+                                     grpc_core::ExternallyManagedSlice(host))
+           : GRPC_MDNULL;
+}
+
+// TODO(vjpai): Delete copy-constructor when allowed by all supported compilers.
+RegisteredCall::RegisteredCall(const RegisteredCall& other) {
+  path = other.path;
+  authority = other.authority;
+  GRPC_MDELEM_REF(path);
+  GRPC_MDELEM_REF(authority);
+}
+
+RegisteredCall::RegisteredCall(RegisteredCall&& other) {
+  path = other.path;
+  authority = other.authority;
+  other.path = GRPC_MDNULL;
+  other.authority = GRPC_MDNULL;
+}
+
+RegisteredCall::~RegisteredCall() {
+  GRPC_MDELEM_UNREF(path);
+  GRPC_MDELEM_UNREF(authority);
+}
+
+}  // namespace grpc_core
+
 void* grpc_channel_register_call(grpc_channel* channel, const char* method,
                                  const char* host, void* reserved) {
-  registered_call* rc =
-      static_cast<registered_call*>(gpr_malloc(sizeof(registered_call)));
   GRPC_API_TRACE(
       "grpc_channel_register_call(channel=%p, method=%s, host=%s, reserved=%p)",
       4, (channel, method, host, reserved));
   GPR_ASSERT(!reserved);
   grpc_core::ExecCtx exec_ctx;
 
-  rc->path = grpc_mdelem_from_slices(GRPC_MDSTR_PATH,
-                                     grpc_core::ExternallyManagedSlice(method));
-  rc->authority =
-      host ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY,
-                                     grpc_core::ExternallyManagedSlice(host))
-           : GRPC_MDNULL;
-  gpr_mu_lock(&channel->registered_call_mu);
-  rc->next = channel->registered_calls;
-  channel->registered_calls = rc;
-  gpr_mu_unlock(&channel->registered_call_mu);
-
-  return rc;
+  grpc_core::MutexLock lock(&channel->registration_table->mu);
+  channel->registration_table->method_registration_attempts++;
+  auto key = std::make_pair(host, method);
+  auto rc_posn = channel->registration_table->map.find(key);
+  if (rc_posn != channel->registration_table->map.end()) {
+    return &rc_posn->second;
+  }
+  auto insertion_result = channel->registration_table->map.insert(
+      {key, grpc_core::RegisteredCall(method, host)});
+  return &insertion_result.first->second;
 }
 
 grpc_call* grpc_channel_create_registered_call(
     grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask,
     grpc_completion_queue* completion_queue, void* registered_call_handle,
     gpr_timespec deadline, void* reserved) {
-  registered_call* rc = static_cast<registered_call*>(registered_call_handle);
+  grpc_core::RegisteredCall* rc =
+      static_cast<grpc_core::RegisteredCall*>(registered_call_handle);
   GRPC_API_TRACE(
       "grpc_channel_create_registered_call("
       "channel=%p, parent_call=%p, propagation_mask=%x, completion_queue=%p, "
@@ -486,18 +509,11 @@ static void destroy_channel(void* arg, grpc_error* /*error*/) {
     channel->channelz_node.reset();
   }
   grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel));
-  while (channel->registered_calls) {
-    registered_call* rc = channel->registered_calls;
-    channel->registered_calls = rc->next;
-    GRPC_MDELEM_UNREF(rc->path);
-    GRPC_MDELEM_UNREF(rc->authority);
-    gpr_free(rc);
-  }
+  channel->registration_table.Destroy();
   if (channel->resource_user != nullptr) {
     grpc_resource_user_free(channel->resource_user,
                             GRPC_RESOURCE_QUOTA_CHANNEL_SIZE);
   }
-  gpr_mu_destroy(&channel->registered_call_mu);
   gpr_free(channel->target);
   gpr_free(channel);
   // See comment in grpc_channel_create() for why we do this.

src/core/lib/surface/channel.h

@@ -21,10 +21,14 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <map>
+
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/channel/channelz.h"
+#include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/lib/transport/metadata.h"
 
 grpc_channel* grpc_channel_create(const char* target,
                                   const grpc_channel_args* args,
@@ -62,7 +66,30 @@ grpc_core::channelz::ChannelNode* grpc_channel_get_channelz_node(
 size_t grpc_channel_get_call_size_estimate(grpc_channel* channel);
 void grpc_channel_update_call_size_estimate(grpc_channel* channel, size_t size);
 
-struct registered_call;
+namespace grpc_core {
+
+struct RegisteredCall {
+  grpc_mdelem path;
+  grpc_mdelem authority;
+
+  explicit RegisteredCall(const char* method, const char* host);
+  // TODO(vjpai): delete copy constructor once all supported compilers allow
+  //              std::map value_type to be MoveConstructible.
+  RegisteredCall(const RegisteredCall& other);
+  RegisteredCall(RegisteredCall&& other);
+
+  ~RegisteredCall();
+};
+
+struct CallRegistrationTable {
+  grpc_core::Mutex mu;
+  std::map<std::pair<const char*, const char*>, RegisteredCall>
+      map /* GUARDED_BY(mu) */;
+  int method_registration_attempts /* GUARDED_BY(mu) */ = 0;
+};
+
+}  // namespace grpc_core
+
 struct grpc_channel {
   int is_client;
   grpc_compression_options compression_options;
@@ -70,9 +97,13 @@ struct grpc_channel {
   gpr_atm call_size_estimate;
   grpc_resource_user* resource_user;
 
-  gpr_mu registered_call_mu;
-  registered_call* registered_calls;
-
+  // TODO(vjpai): Once the grpc_channel is allocated via new rather than malloc,
+  //              expand the members of the CallRegistrationTable directly into
+  //              the grpc_channel. For now it is kept separate so that all the
+  //              manual constructing can be done with a single call rather than
+  //              a separate manual construction for each field.
+  grpc_core::ManualConstructor<grpc_core::CallRegistrationTable>
+      registration_table;
   grpc_core::RefCountedPtr<grpc_core::channelz::ChannelNode> channelz_node;
 
   char* target;

src/core/lib/surface/version.cc

@@ -25,4 +25,4 @@
 
 const char* grpc_version_string(void) { return "9.0.0"; }
 
-const char* grpc_g_stands_for(void) { return "galactic"; }
+const char* grpc_g_stands_for(void) { return "gringotts"; }

src/core/lib/transport/metadata_batch.cc

@@ -205,19 +205,6 @@ grpc_error* grpc_metadata_batch_add_tail(grpc_metadata_batch* batch,
   return grpc_metadata_batch_link_tail(batch, storage);
 }
 
-grpc_error* grpc_metadata_batch_add_tail_when_key_not_exist(
-    grpc_metadata_batch* batch, grpc_linked_mdelem* storage,
-    grpc_mdelem elem_to_add) {
-  auto cur = batch->list.head;
-  while (cur != nullptr) {
-    if (grpc_slice_cmp(GRPC_MDKEY(cur->md), GRPC_MDKEY(elem_to_add)) == 0) {
-      // We already have the same key, just returning.
-      return GRPC_ERROR_NONE;
-    }
-  }
-  return grpc_metadata_batch_add_tail(batch, storage, elem_to_add);
-}
-
 static void link_tail(grpc_mdelem_list* list, grpc_linked_mdelem* storage) {
   assert_valid_list(list);
   GPR_DEBUG_ASSERT(!GRPC_MDISNULL(storage->md));

src/core/lib/transport/metadata_batch.h

@@ -138,17 +138,6 @@ grpc_error* grpc_metadata_batch_add_tail(
     grpc_metadata_batch* batch, grpc_linked_mdelem* storage,
     grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT;
 
-/** Add \a elem_to_add as the last element in \a batch, only
-    when the current batch doesn't have the same key in the
-    given element, using \a storage as backing storage for the
-    linked list element.  \a storage is owned by the caller
-    and must survive for the lifetime of batch. This usually
-    means it should be around for the lifetime of the call.
-    Takes ownership of \a elem_to_add */
-grpc_error* grpc_metadata_batch_add_tail_when_key_not_exist(
-    grpc_metadata_batch* batch, grpc_linked_mdelem* storage,
-    grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT;
-
 inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail(
     grpc_metadata_batch* batch, grpc_linked_mdelem* storage,
     grpc_metadata_batch_callouts_index idx) {

src/core/tsi/ssl_transport_security.cc

@@ -1122,7 +1122,8 @@ static void tsi_ssl_handshaker_factory_init(
 tsi_result tsi_ssl_get_cert_chain_contents(STACK_OF(X509) * peer_chain,
                                            tsi_peer_property* property) {
   BIO* bio = BIO_new(BIO_s_mem());
-  for (int i = 0; i < sk_X509_num(peer_chain); i++) {
+  const auto peer_chain_len = sk_X509_num(peer_chain);
+  for (auto i = decltype(peer_chain_len){0}; i < peer_chain_len; i++) {
     if (!PEM_write_bio_X509(bio, sk_X509_value(peer_chain, i))) {
       BIO_free(bio);
       return TSI_INTERNAL_ERROR;

src/cpp/client/channel_test_peer.cc

@@ -0,0 +1,40 @@
+/*
+ *
+ * Copyright 2020 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <grpcpp/test/channel_test_peer.h>
+
+#include <grpc/support/sync.h>
+#include <grpcpp/channel.h>
+
+#include "src/core/lib/surface/channel.h"
+
+namespace grpc {
+namespace testing {
+
+int ChannelTestPeer::registered_calls() const {
+  grpc_core::MutexLock lock(&channel_->c_channel_->registration_table->mu);
+  return static_cast<int>(channel_->c_channel_->registration_table->map.size());
+}
+
+int ChannelTestPeer::registration_attempts() const {
+  grpc_core::MutexLock lock(&channel_->c_channel_->registration_table->mu);
+  return channel_->c_channel_->registration_table->method_registration_attempts;
+}
+
+}  // namespace testing
+}  // namespace grpc

src/cpp/common/version_cc.cc

@@ -22,5 +22,5 @@
 #include <grpcpp/grpcpp.h>
 
 namespace grpc {
-grpc::string Version() { return "1.28.0-dev"; }
+grpc::string Version() { return "1.29.0-dev"; }
 }  // namespace grpc

src/csharp/Grpc.Core.Api/CallCredentials.cs

@@ -30,7 +30,7 @@ namespace Grpc.Core
     public abstract class CallCredentials
     {
         /// <summary>
-        /// Composes multiple multiple <c>CallCredentials</c> objects into
+        /// Composes multiple <c>CallCredentials</c> objects into
         /// a single <c>CallCredentials</c> object.
         /// </summary>
         /// <param name="credentials">credentials to compose</param>

src/csharp/Grpc.Core.Api/CallOptions.cs

@@ -112,7 +112,7 @@ namespace Grpc.Core
         }
 
         /// <summary>
-        /// If <c>true</c> and and channel is in <c>ChannelState.TransientFailure</c>, the call will attempt waiting for the channel to recover
+        /// If <c>true</c> and channel is in <c>ChannelState.TransientFailure</c>, the call will attempt waiting for the channel to recover
         /// instead of failing immediately (which is the default "FailFast" semantics).
         /// Note: experimental API that can change or be removed without any prior notice.
         /// </summary>

src/csharp/Grpc.Core.Api/VersionInfo.cs

@@ -33,11 +33,11 @@ namespace Grpc.Core
         /// <summary>
         /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
         /// </summary>
-        public const string CurrentAssemblyFileVersion = "2.28.0.0";
+        public const string CurrentAssemblyFileVersion = "2.29.0.0";
 
         /// <summary>
         /// Current version of gRPC C#
         /// </summary>
-        public const string CurrentVersion = "2.28.0-dev";
+        public const string CurrentVersion = "2.29.0-dev";
     }
 }

src/csharp/Grpc.Core/Internal/UnmanagedLibrary.cs

@@ -217,7 +217,7 @@ namespace Grpc.Core.Internal
         }
 
         /// <summary>
-        /// On Linux systems, using using dlopen and dlsym results in
+        /// On Linux systems, using dlopen and dlsym results in
         /// DllNotFoundException("libdl.so not found") if libc6-dev
         /// is not installed. As a workaround, we load symbols for
         /// dlopen and dlsym from the current process as on Linux

src/csharp/build/dependencies.props

@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.28.0-dev</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.29.0-dev</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.11.2</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

src/csharp/build_unitypackage.bat

@@ -13,7 +13,7 @@
 @rem limitations under the License.
 
 @rem Current package versions
-set VERSION=2.28.0-dev
+set VERSION=2.29.0-dev
 
 @rem Adjust the location of nuget.exe
 set NUGET=C:\nuget\nuget.exe

src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec

@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCCppPlugin'
-  v = '1.28.0-dev'
+  v = '1.29.0-dev'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC

src/objective-c/!ProtoCompiler-gRPCPlugin.podspec

@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.28.0-dev'
+  v = '1.29.0-dev'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

src/objective-c/GRPCClient/version.h

@@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.28.0-dev"
+#define GRPC_OBJC_VERSION_STRING @"1.29.0-dev"

src/objective-c/tests/version.h

@@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.28.0-dev"
+#define GRPC_OBJC_VERSION_STRING @"1.29.0-dev"
 #define GRPC_C_VERSION_STRING @"9.0.0"

src/php/composer.json

@@ -2,7 +2,7 @@
   "name": "grpc/grpc-dev",
   "description": "gRPC library for PHP - for Development use only",
   "license": "Apache-2.0",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "require": {
     "php": ">=5.5.0",
     "google/protobuf": "^v3.3.0"

src/php/ext/grpc/version.h

@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.28.0dev"
+#define PHP_GRPC_VERSION "1.29.0dev"
 
 #endif /* VERSION_H */

src/python/grpcio/grpc/_grpcio_metadata.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
 
-__version__ = """1.28.0.dev0"""
+__version__ = """1.29.0.dev0"""

src/python/grpcio/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/python/grpcio_channelz/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/python/grpcio_health_checking/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/python/grpcio_reflection/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/python/grpcio_status/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/python/grpcio_testing/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/python/grpcio_tests/grpc_version.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION = '1.28.0.dev0'
+VERSION = '1.29.0.dev0'

src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.28.0.dev'
+  VERSION = '1.29.0.dev'
 end

src/ruby/tools/version.rb

@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.28.0.dev'
+    VERSION = '1.29.0.dev'
   end
 end

templates/gRPC-C++.podspec.template

@@ -60,42 +60,43 @@
         files.update(lib.get(field, []))
     return list(sorted(files))
 
-  def list_filegroup_files(expect_filegroups, groups):
-    out = []
-    for filegroup_name in expect_filegroups:
-      filegroup = filegroup_maps[filegroup_name]
-      for group in groups:
-        out += filegroup.get(group, [])
-    return list(sorted(set(out)))
-
   def filter_grpcpp(files):
     return sorted([file for file in files if not file.startswith("include/grpc++")])
 
-  grpc_private_files = list_lib_files("grpc", ("headers", "src"))
-  grpc_public_headers = list_lib_files("grpc", ("public_headers",))
-  grpc_private_headers = list_lib_files("grpc", ("headers",))
+  # ObjectiveC doesn't use c-ares so we don't need address_sorting files at all
+  address_sorting_unwanted_files = list_lib_files("address_sorting", ("public_headers", "headers", "src"))
+
+  grpc_private_files = list(sorted(set(list_lib_files("grpc", ("headers", "src"))) - set(address_sorting_unwanted_files)))
+  grpc_public_headers = list(sorted(set(list_lib_files("grpc", ("public_headers",))) - set(address_sorting_unwanted_files)))
+  grpc_private_headers = list(sorted(set(list_lib_files("grpc", ("headers",))) - set(address_sorting_unwanted_files)))
+
+  # TODO(jtattermusch): build.yaml no longer has filegroups, so the files here are just hand-listed
+  # This template shouldn't be touching the filegroups anyway, so this is only a bit more fragile.
+  grpcpp_proto_files = ['include/grpcpp/impl/codegen/config_protobuf.h',
+                        'include/grpcpp/impl/codegen/proto_buffer_reader.h',
+                        'include/grpcpp/impl/codegen/proto_buffer_writer.h',
+                        'include/grpcpp/impl/codegen/proto_utils.h']
 
-  grpcpp_proto_files = filter_grpcpp(
-    set(list_filegroup_files(("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src", "public_headers")))
-    - set(list_filegroup_files(("grpc++_codegen_base",), ("headers", "src", "public_headers")))
-  )
   grpcpp_private_files = filter_grpcpp(
     set(list_lib_files("grpc++", ("headers", "src")))
     - set(grpc_private_files)
     # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
     - set(grpcpp_proto_files)
+    - set(address_sorting_unwanted_files)
   )
   grpcpp_private_headers = filter_grpcpp(
     set(list_lib_files("grpc++", ("headers",)))
     - set(grpc_private_headers)
     # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
     - set(grpcpp_proto_files)
+    - set(address_sorting_unwanted_files)
   )
   grpcpp_public_headers = filter_grpcpp(
     set(list_lib_files("grpc++", ("public_headers",)))
     - set(grpc_public_headers)
     # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
     - set(grpcpp_proto_files)
+    - set(address_sorting_unwanted_files)
   )
   grpcpp_abseil_specs = list_abseil_specs("grpc++")
   %>
@@ -163,7 +164,7 @@
       ss.header_mappings_dir = '.'
       ss.dependency "#{s.name}/Interface", version
       ss.dependency 'gRPC-Core', version
-      abseil_version = '0.20190808.1'
+      abseil_version = '0.20200225.0'
       % for abseil_spec in grpcpp_abseil_specs:
       ss.dependency '${abseil_spec}', abseil_version
       % endfor
@@ -199,6 +200,7 @@
     end
 
     s.prepare_command = <<-END_OF_COMMAND
+      sed -E -i '' 's;#include <openssl/(.*)>;#if COCOAPODS==1\\\n  #include <openssl_grpc/\\1>\\\n#else\\\n  #include <openssl/\\1>\\\n#endif;g' $(find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print | xargs grep -H -c '#include <openssl_grpc/' | grep 0$ | cut -d':' -f1)
       find src/core/ third_party/upb/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "upb/(.*)";#if COCOAPODS==1\\\n  #include  "third_party/upb/upb/\\1"\\\n#else\\\n  #include  "upb/\\1"\\\n#endif;g'
       find src/core/ third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
       find src/core/ src/cpp/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "src/core/ext/upb-generated/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'

templates/gRPC-Core.podspec.template

@@ -59,27 +59,35 @@
         files.update(lib.get(field, []))
     return list(sorted(files))
 
-  grpc_private_files = list_lib_files("grpc", ("headers", "src"))
-  grpc_public_headers = list_lib_files("grpc", ("public_headers",))
-  grpc_private_headers = list_lib_files("grpc", ("headers",))
+  # ObjectiveC doesn't use c-ares so we don't need address_sorting files at all
+  address_sorting_unwanted_files = list_lib_files("address_sorting", ("public_headers", "headers", "src"))
+
+  grpc_private_files = list(sorted(set(list_lib_files("grpc", ("headers", "src"))) - set(address_sorting_unwanted_files)))
+  grpc_public_headers = list(sorted(set(list_lib_files("grpc", ("public_headers",))) - set(address_sorting_unwanted_files)))
+  grpc_private_headers = list(sorted(set(list_lib_files("grpc", ("headers",))) - set(address_sorting_unwanted_files)))
   grpc_abseil_specs = list_abseil_specs("grpc")
 
-  grpc_cronet_files = list(sorted(
-    set(list_lib_files("grpc_cronet", ("src", "headers")))
-    - set(grpc_private_files)
-    - set([
-      # We do not need cronet dedicated plugin registry
-      "src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc",
-      # We do not need dummy cronet API for ObjC
-      "src/core/ext/transport/cronet/transport/cronet_api_dummy.cc",
-    ])))
-  grpc_cronet_public_headers = list(sorted(
-    set(list_lib_files("grpc_cronet", ("public_headers",)))
-    - set(grpc_public_headers)))
+
+  # TODO(jtattermusch): build.yaml is now generated from bazel build
+  # which doesn't have an explicit "grpc_cronet" target. Until it exists
+  # we construct the list of files by taking what's in the "grpc" target
+  # and adding a few files on top of that.
+  grpc_cronet_extra_public_headers = ['include/grpc/grpc_cronet.h']
+  grpc_cronet_extra_impl_files = [
+      'src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc',
+      'src/core/ext/transport/cronet/client/secure/cronet_channel_create.h',
+      'src/core/ext/transport/cronet/transport/cronet_transport.cc',
+      'src/core/ext/transport/cronet/transport/cronet_transport.h',
+      'third_party/objective_c/Cronet/bidirectional_stream_c.h'
+  ]
+
+  grpc_cronet_files = list(sorted(grpc_cronet_extra_impl_files))
+  grpc_cronet_public_headers = list(sorted(grpc_cronet_extra_public_headers))
 
   grpc_test_util_files = list(sorted(
     set(list_lib_files("end2end_tests", ("src", "headers")))
     - set(grpc_private_files)
+    - set(address_sorting_unwanted_files)
     - set([
       # Subprocess is not supported in tvOS and not needed by our tests.
       "test/core/util/subprocess_posix.cc",
@@ -185,7 +193,7 @@
       ss.libraries = 'z'
       ss.dependency "#{s.name}/Interface", version
       ss.dependency 'BoringSSL-GRPC', '0.0.7'
-      abseil_version = '0.20190808.1'
+      abseil_version = '0.20200225.0'
       % for abseil_spec in grpc_abseil_specs:
       ss.dependency '${abseil_spec}', abseil_version
       % endfor

templates/grpc.gemspec.template

@@ -21,7 +21,10 @@
     s.files += %w( etc/roots.pem )
     s.files += Dir.glob('src/ruby/bin/**/*')
     s.files += Dir.glob('src/ruby/ext/**/*')
-    s.files += Dir.glob('src/ruby/lib/**/*')
+    s.files += Dir.glob('src/ruby/lib/**/*').reject do |f|
+      # Binaries are included by rake-compiler and would lead to circular dependencies here
+      File.fnmatch("**/?.?/grpc_c.so", f)
+    end
     s.files += Dir.glob('src/ruby/pb/**/*').reject do |f|
       f.match(%r{^src/ruby/pb/test})
     end
@@ -38,9 +41,9 @@
     s.add_development_dependency 'facter',             '~> 2.4'
     s.add_development_dependency 'logging',            '~> 2.0'
     s.add_development_dependency 'simplecov',          '~> 0.14.1'
-    s.add_development_dependency 'rake',               '~> 12.0'
-    s.add_development_dependency 'rake-compiler',      '~> 1.0'
-    s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1'
+    s.add_development_dependency 'rake',               '~> 13.0'
+    s.add_development_dependency 'rake-compiler',      '~> 1.1'
+    s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
     s.add_development_dependency 'rspec',              '~> 3.6'
     s.add_development_dependency 'rubocop',            '~> 0.49.1'
     s.add_development_dependency 'signet',             '~> 0.7'

templates/src/core/plugin_registry.template

@@ -1,39 +0,0 @@
-%YAML 1.2
----
-foreach: libs
-cond: selected.get('generate_plugin_registry', False)
-output_name: ${selected.name}_plugin_registry.cc
-template: |
-  /*
-   *
-   * Copyright 2016 gRPC authors.
-   *
-   * Licensed under the Apache License, Version 2.0 (the "License");
-   * you may not use this file except in compliance with the License.
-   * You may obtain a copy of the License at
-   *
-   *     http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License.
-   *
-   */
-
-  #include <grpc/support/port_platform.h>
-
-  #include <grpc/grpc.h>
-
-  %for plugin in selected.plugins:
-  void ${plugin}_init(void);
-  void ${plugin}_shutdown(void);
-  %endfor
-
-  void grpc_register_built_in_plugins(void) {
-  %for plugin in selected.plugins:
-    grpc_register_plugin(${plugin}_init,
-                         ${plugin}_shutdown);
-  %endfor
-  }

templates/tools/doxygen/Doxyfile.c++.internal.template

@@ -1,4 +1,4 @@
 %YAML 1.2
 --- |
   <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
-  ${gen_doxyfile(['grpc++'], 'C++', libs, True)}
+  ${gen_doxyfile(['grpc++', 'grpc', 'gpr'], 'C++', libs, True)}

templates/tools/doxygen/Doxyfile.c++.template

@@ -1,4 +1,4 @@
 %YAML 1.2
 --- |
   <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
-  ${gen_doxyfile(['grpc++'], 'C++', libs, False)}
+  ${gen_doxyfile(['grpc++', 'grpc', 'gpr'], 'C++', libs, False)}

test/core/bad_client/gen_build_yaml.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python2.7
-# Copyright 2015 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Generates the appropriate build.json data for all the bad_client tests."""
-
-from __future__ import print_function
-import collections
-import yaml
-
-TestOptions = collections.namedtuple('TestOptions', 'flaky cpu_cost')
-default_test_options = TestOptions(False, 1.0)
-
-# maps test names to options
-BAD_CLIENT_TESTS = {
-    'badreq': default_test_options,
-    'bad_streaming_id': default_test_options,
-    'connection_prefix': default_test_options._replace(cpu_cost=0.2),
-    'duplicate_header': default_test_options,
-    'headers': default_test_options._replace(cpu_cost=0.2),
-    'initial_settings_frame': default_test_options._replace(cpu_cost=0.2),
-    'head_of_line_blocking': default_test_options,
-    'large_metadata': default_test_options,
-    'out_of_bounds': default_test_options,
-    'server_registered_method': default_test_options,
-    'simple_request': default_test_options,
-    'window_overflow': default_test_options,
-    'unknown_frame': default_test_options,
-}
-
-
-def main():
-    json = {
-        '#':
-            'generated with test/bad_client/gen_build_json.py',
-        'libs': [{
-            'name': 'bad_client_test',
-            'build': 'private',
-            'language': 'c++',
-            'src': ['test/core/bad_client/bad_client.cc'],
-            'headers': ['test/core/bad_client/bad_client.h'],
-            'vs_proj_dir': 'test/bad_client',
-            'deps': ['grpc_test_util_unsecure', 'grpc_unsecure', 'gpr']
-        }],
-        'targets': [{
-            'name':
-                '%s_bad_client_test' % t,
-            'cpu_cost':
-                BAD_CLIENT_TESTS[t].cpu_cost,
-            'build':
-                'test',
-            'language':
-                'c++',
-            'secure':
-                False,
-            'src': ['test/core/bad_client/tests/%s.cc' % t],
-            'vs_proj_dir':
-                'test',
-            'exclude_iomgrs': ['uv'],
-            'deps': [
-                'bad_client_test', 'grpc_test_util_unsecure', 'grpc_unsecure',
-                'gpr'
-            ]
-        } for t in sorted(BAD_CLIENT_TESTS.keys())]
-    }
-    print(yaml.dump(json))
-
-
-if __name__ == '__main__':
-    main()

test/core/bad_ssl/gen_build_yaml.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python2.7
-# Copyright 2015 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Generates the appropriate build.json data for all the end2end tests."""
-
-import collections
-import yaml
-
-TestOptions = collections.namedtuple('TestOptions', 'flaky cpu_cost')
-default_test_options = TestOptions(False, 1.0)
-
-# maps test names to options
-BAD_CLIENT_TESTS = {
-    'cert': default_test_options._replace(cpu_cost=0.1),
-    # Disabling this test because it does not link correctly as written
-    # 'alpn': default_test_options._replace(cpu_cost=0.1),
-}
-
-
-def main():
-    json = {
-        '#':
-            'generated with test/bad_ssl/gen_build_json.py',
-        'libs': [{
-            'name': 'bad_ssl_test_server',
-            'build': 'private',
-            'language': 'c',
-            'src': ['test/core/bad_ssl/server_common.cc'],
-            'headers': ['test/core/bad_ssl/server_common.h'],
-            'vs_proj_dir': 'test',
-            'platforms': ['linux', 'posix', 'mac'],
-            'deps': ['grpc_test_util', 'grpc', 'gpr']
-        }],
-        'targets': [{
-            'name': 'bad_ssl_%s_server' % t,
-            'build': 'test',
-            'language': 'c',
-            'run': False,
-            'src': ['test/core/bad_ssl/servers/%s.cc' % t],
-            'vs_proj_dir': 'test/bad_ssl',
-            'platforms': ['linux', 'posix', 'mac'],
-            'deps': ['bad_ssl_test_server', 'grpc_test_util', 'grpc', 'gpr']
-        } for t in sorted(BAD_CLIENT_TESTS.keys())] + [{
-            'name': 'bad_ssl_%s_test' % t,
-            'cpu_cost': BAD_CLIENT_TESTS[t].cpu_cost,
-            'build': 'test',
-            'language': 'c',
-            'src': ['test/core/bad_ssl/bad_ssl_test.cc'],
-            'vs_proj_dir': 'test',
-            'platforms': ['linux', 'posix', 'mac'],
-            'deps': ['grpc_test_util', 'grpc', 'gpr']
-        } for t in sorted(BAD_CLIENT_TESTS.keys())]
-    }
-    print yaml.dump(json)
-
-
-if __name__ == '__main__':
-    main()

test/core/end2end/gen_build_yaml.py

@@ -401,140 +401,16 @@ def without(l, e):
     return l
 
 
+# Originally, this method was used to generate end2end test cases for build.yaml,
+# but since the test cases are now extracted from bazel BUILD file,
+# this is not used for generating run_tests.py test cases anymore.
+# Nevertheless, subset of the output is still used by end2end_tests.cc.template
+# and end2end_nosec_tests.cc.template
+# TODO(jtattermusch): cleanup this file, so that it only generates the data we need.
+# Right now there's some duplication between generate_tests.bzl and this file.
 def main():
-    sec_deps = ['grpc_test_util', 'grpc', 'gpr']
-    unsec_deps = ['grpc_test_util_unsecure', 'grpc_unsecure', 'gpr']
     json = {
-        '#':
-            'generated with test/end2end/gen_build_json.py',
-        'libs': [{
-            'name':
-                'end2end_tests',
-            'build':
-                'private',
-            'language':
-                'c',
-            'secure':
-                True,
-            'src': [
-                'test/core/end2end/end2end_tests.cc',
-                'test/core/end2end/end2end_test_utils.cc'
-            ] + [
-                'test/core/end2end/tests/%s.cc' % t
-                for t in sorted(END2END_TESTS.keys())
-            ],
-            'headers': [
-                'test/core/end2end/tests/cancel_test_helpers.h',
-                'test/core/end2end/end2end_tests.h'
-            ],
-            'deps':
-                sec_deps,
-            'vs_proj_dir':
-                'test/end2end/tests',
-        }] + [{
-            'name':
-                'end2end_nosec_tests',
-            'build':
-                'private',
-            'language':
-                'c',
-            'secure':
-                False,
-            'src': [
-                'test/core/end2end/end2end_nosec_tests.cc',
-                'test/core/end2end/end2end_test_utils.cc'
-            ] + [
-                'test/core/end2end/tests/%s.cc' % t
-                for t in sorted(END2END_TESTS.keys())
-                if not END2END_TESTS[t].secure
-            ],
-            'headers': [
-                'test/core/end2end/tests/cancel_test_helpers.h',
-                'test/core/end2end/end2end_tests.h'
-            ],
-            'deps':
-                unsec_deps,
-            'vs_proj_dir':
-                'test/end2end/tests',
-        }],
-        'targets': [{
-            'name': '%s_test' % f,
-            'build': 'test',
-            'language': 'c',
-            'run': False,
-            'src': ['test/core/end2end/fixtures/%s.cc' % f],
-            'platforms': END2END_FIXTURES[f].platforms,
-            'ci_platforms':
-                (END2END_FIXTURES[f].platforms if END2END_FIXTURES[f].ci_mac
-                 else without(END2END_FIXTURES[f].platforms, 'mac')),
-            'deps': ['end2end_tests'] + sec_deps,
-            'vs_proj_dir': 'test/end2end/fixtures',
-        } for f in sorted(END2END_FIXTURES.keys())] + [{
-            'name': '%s_nosec_test' % f,
-            'build': 'test',
-            'language': 'c',
-            'secure': False,
-            'src': ['test/core/end2end/fixtures/%s.cc' % f],
-            'run': False,
-            'platforms': END2END_FIXTURES[f].platforms,
-            'ci_platforms':
-                (END2END_FIXTURES[f].platforms if END2END_FIXTURES[f].ci_mac
-                 else without(END2END_FIXTURES[f].platforms, 'mac')),
-            'deps': ['end2end_nosec_tests'] + unsec_deps,
-            'vs_proj_dir': 'test/end2end/fixtures',
-        } for f in sorted(
-            END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure],
-        'tests': [{
-            'name':
-                '%s_test' % f,
-            'args': [t],
-            'exclude_configs':
-                END2END_FIXTURES[f].exclude_configs,
-            'exclude_iomgrs':
-                list(
-                    set(END2END_FIXTURES[f].exclude_iomgrs) |
-                    set(END2END_TESTS[t].exclude_iomgrs)),
-            'platforms':
-                END2END_FIXTURES[f].platforms,
-            'ci_platforms':
-                (END2END_FIXTURES[f].platforms if END2END_FIXTURES[f].ci_mac
-                 else without(END2END_FIXTURES[f].platforms, 'mac')),
-            'flaky':
-                END2END_TESTS[t].flaky,
-            'language':
-                'c',
-            'cpu_cost':
-                END2END_TESTS[t].cpu_cost,
-        }
-                  for f in sorted(END2END_FIXTURES.keys())
-                  for t in sorted(END2END_TESTS.keys())
-                  if compatible(f, t)] +
-                 [{
-                     'name':
-                         '%s_nosec_test' % f,
-                     'args': [t],
-                     'exclude_configs':
-                         END2END_FIXTURES[f].exclude_configs,
-                     'exclude_iomgrs':
-                         list(
-                             set(END2END_FIXTURES[f].exclude_iomgrs) |
-                             set(END2END_TESTS[t].exclude_iomgrs)),
-                     'platforms':
-                         END2END_FIXTURES[f].platforms,
-                     'ci_platforms':
-                         (END2END_FIXTURES[f].platforms
-                          if END2END_FIXTURES[f].ci_mac else without(
-                              END2END_FIXTURES[f].platforms, 'mac')),
-                     'flaky':
-                         END2END_TESTS[t].flaky,
-                     'language':
-                         'c',
-                     'cpu_cost':
-                         END2END_TESTS[t].cpu_cost,
-                 } for f in sorted(END2END_FIXTURES.keys())
-                  if not END2END_FIXTURES[f].secure
-                  for t in sorted(END2END_TESTS.keys())
-                  if compatible(f, t) and not END2END_TESTS[t].secure],
+        # needed by end2end_tests.cc.template and end2end_nosec_tests.cc.template
         'core_end2end_tests':
             dict((t, END2END_TESTS[t].secure) for t in END2END_TESTS.keys())
     }

test/core/end2end/tests/disappearing_server.cc

@@ -161,6 +161,14 @@ static void do_request_and_shutdown_server(grpc_end2end_test_config /*config*/,
   CQ_EXPECT_COMPLETION(cqv, tag(1), 1);
   CQ_EXPECT_COMPLETION(cqv, tag(1000), 1);
   cq_verify(cqv);
+  /* Please refer https://github.com/grpc/grpc/issues/21221 for additional
+   * details.
+   * TODO(yashykt@) - The following line should be removeable after C-Core
+   * correctly handles GOAWAY frames. Internal Reference b/135458602. If this
+   * test remains flaky even after this, an alternative fix would be to send a
+   * request when the server is in the shut down state.
+   */
+  cq_verify_empty(cqv);
 
   GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED);
   GPR_ASSERT(0 == grpc_slice_str_cmp(details, "xyz"));

test/core/iomgr/BUILD

@@ -144,7 +144,6 @@ grpc_cc_test(
     language = "C++",
     tags = [
         "no_windows",  # LARGE_MACHINE is not configured for windows RBE
-        "notap",  # TODO(yashykt@): TSAN on TAP runs very slow. Fix it for TAP.
     ],
     deps = [
         "//:gpr",

test/core/security/credentials_test.cc

@@ -97,13 +97,6 @@ static const char test_refresh_token_str[] =
     "  \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\","
     "  \"type\": \"authorized_user\"}";
 
-static const char test_refresh_token_with_quota_project_id_str[] =
-    "{ \"client_id\": \"32555999999.apps.googleusercontent.com\","
-    "  \"client_secret\": \"EmssLNjJy1332hD4KFsecret\","
-    "  \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\","
-    "  \"quota_project_id\": \"my-quota-project-id\","
-    "  \"type\": \"authorized_user\"}";
-
 static const char valid_oauth2_json_response[] =
     "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\","
     " \"expires_in\":3599, "
@@ -720,37 +713,7 @@ static void test_refresh_token_creds_success(void) {
   /* Check security level. */
   GPR_ASSERT(creds->min_security_level() == GRPC_PRIVACY_AND_INTEGRITY);
 
-  /* First request: http post should be called. */
-  request_metadata_state* state =
-      make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd));
-  grpc_httpcli_set_override(httpcli_get_should_not_be_called,
-                            refresh_token_httpcli_post_success);
-  run_request_metadata_test(creds, auth_md_ctx, state);
-  grpc_core::ExecCtx::Get()->Flush();
-
-  /* Second request: the cached token should be served directly. */
-  state =
-      make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd));
-  grpc_httpcli_set_override(httpcli_get_should_not_be_called,
-                            httpcli_post_should_not_be_called);
-  run_request_metadata_test(creds, auth_md_ctx, state);
-  grpc_core::ExecCtx::Get()->Flush();
-
-  creds->Unref();
-  grpc_httpcli_set_override(nullptr, nullptr);
-}
-
-static void test_refresh_token_with_quota_project_id_creds_success(void) {
-  grpc_core::ExecCtx exec_ctx;
-  expected_md emd[] = {
-      {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"},
-      {"x-goog-user-project", "my-quota-project-id"}};
-  grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method,
-                                            nullptr, nullptr};
-  grpc_call_credentials* creds = grpc_google_refresh_token_credentials_create(
-      test_refresh_token_with_quota_project_id_str, nullptr);
-
-  /* First request: http post should be called. */
+  /* First request: http put should be called. */
   request_metadata_state* state =
       make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd));
   grpc_httpcli_set_override(httpcli_get_should_not_be_called,
@@ -1752,7 +1715,6 @@ int main(int argc, char** argv) {
   test_compute_engine_creds_success();
   test_compute_engine_creds_failure();
   test_refresh_token_creds_success();
-  test_refresh_token_with_quota_project_id_creds_success();
   test_refresh_token_creds_failure();
   test_valid_sts_creds_options();
   test_invalid_sts_creds_options();

test/core/security/json_token_test.cc

@@ -75,13 +75,6 @@ static const char test_refresh_token_str[] =
     "  \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\","
     "  \"type\": \"authorized_user\"}";
 
-static const char test_refresh_token_with_quota_project_id_str[] =
-    "{ \"client_id\": \"32555999999.apps.googleusercontent.com\","
-    "  \"client_secret\": \"EmssLNjJy1332hD4KFsecret\","
-    "  \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\","
-    "  \"quota_project_id\": \"my-quota-project-id\","
-    "  \"type\": \"authorized_user\"}";
-
 static const char test_scope[] = "myperm1 myperm2";
 
 static const char test_service_url[] = "https://foo.com/foo.v1";
@@ -396,29 +389,6 @@ static void test_parse_refresh_token_success(void) {
   GPR_ASSERT(refresh_token.refresh_token != nullptr &&
              (strcmp(refresh_token.refresh_token,
                      "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42") == 0));
-  GPR_ASSERT(refresh_token.quota_project_id == nullptr);
-  grpc_auth_refresh_token_destruct(&refresh_token);
-}
-
-static void test_parse_refresh_token_with_quota_project_id_success(void) {
-  grpc_auth_refresh_token refresh_token =
-      grpc_auth_refresh_token_create_from_string(
-          test_refresh_token_with_quota_project_id_str);
-  GPR_ASSERT(grpc_auth_refresh_token_is_valid(&refresh_token));
-  GPR_ASSERT(refresh_token.type != nullptr &&
-             (strcmp(refresh_token.type, "authorized_user") == 0));
-  GPR_ASSERT(refresh_token.client_id != nullptr &&
-             (strcmp(refresh_token.client_id,
-                     "32555999999.apps.googleusercontent.com") == 0));
-  GPR_ASSERT(
-      refresh_token.client_secret != nullptr &&
-      (strcmp(refresh_token.client_secret, "EmssLNjJy1332hD4KFsecret") == 0));
-  GPR_ASSERT(refresh_token.refresh_token != nullptr &&
-             (strcmp(refresh_token.refresh_token,
-                     "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42") == 0));
-  GPR_ASSERT(
-      refresh_token.quota_project_id != nullptr &&
-      (strcmp(refresh_token.quota_project_id, "my-quota-project-id") == 0));
   grpc_auth_refresh_token_destruct(&refresh_token);
 }
 
@@ -475,7 +445,6 @@ int main(int argc, char** argv) {
   test_service_account_creds_jwt_encode_and_sign();
   test_jwt_creds_jwt_encode_and_sign();
   test_parse_refresh_token_success();
-  test_parse_refresh_token_with_quota_project_id_success();
   test_parse_refresh_token_failure_no_type();
   test_parse_refresh_token_failure_no_client_id();
   test_parse_refresh_token_failure_no_client_secret();

test/core/util/test_lb_policies.cc

@@ -209,6 +209,13 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy
   }
 };
 
+class InterceptTrailingConfig : public LoadBalancingPolicy::Config {
+ public:
+  const char* name() const override {
+    return kInterceptRecvTrailingMetadataLbPolicyName;
+  }
+};
+
 class InterceptTrailingFactory : public LoadBalancingPolicyFactory {
  public:
   explicit InterceptTrailingFactory(InterceptRecvTrailingMetadataCallback cb,
@@ -227,7 +234,7 @@ class InterceptTrailingFactory : public LoadBalancingPolicyFactory {
 
   RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig(
       const Json& /*json*/, grpc_error** /*error*/) const override {
-    return nullptr;
+    return MakeRefCounted<InterceptTrailingConfig>();
   }
 
  private:

test/cpp/common/BUILD

@@ -49,7 +49,10 @@ grpc_cc_test(
     external_deps = [
         "gtest",
     ],
-    tags = ["manual"],
+    tags = [
+        "manual",
+        "no_windows",
+    ],
     deps = [
         "//:grpc++",
         "//test/core/util:grpc_test_util",

test/cpp/end2end/BUILD

@@ -225,6 +225,7 @@ grpc_cc_library(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//:grpc++_test",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
         "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",

test/cpp/end2end/end2end_test.cc

@@ -31,6 +31,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <grpcpp/test/channel_test_peer.h>
 
 #include <mutex>
 #include <thread>
@@ -812,6 +813,19 @@ TEST_P(End2endTest, MultipleRpcs) {
   }
 }
 
+TEST_P(End2endTest, ManyStubs) {
+  MAYBE_SKIP_TEST;
+  ResetStub();
+  ChannelTestPeer peer(channel_.get());
+  int registered_calls_pre = peer.registered_calls();
+  int registration_attempts_pre = peer.registration_attempts();
+  for (int i = 0; i < 1000; ++i) {
+    grpc::testing::EchoTestService::NewStub(channel_);
+  }
+  EXPECT_EQ(peer.registered_calls(), registered_calls_pre);
+  EXPECT_GT(peer.registration_attempts(), registration_attempts_pre);
+}
+
 TEST_P(End2endTest, EmptyBinaryMetadata) {
   MAYBE_SKIP_TEST;
   ResetStub();

test/cpp/microbenchmarks/BUILD

@@ -218,6 +218,7 @@ grpc_cc_test(
     srcs = ["bm_fullstack_trickle.cc"],
     tags = [
         "manual",
+        "no_windows",
         "notap",
     ],
     deps = [":helpers"],
@@ -315,6 +316,7 @@ grpc_cc_test(
     srcs = ["bm_threadpool.cc"],
     tags = [
         "manual",
+        "no_windows",
         "notap",
     ],
     uses_polling = False,

test/cpp/naming/gen_build_yaml.py

@@ -68,104 +68,9 @@ def main():
     json = {
         'resolver_tests_common_zone_name':
             resolver_component_data['resolver_tests_common_zone_name'],
+        # this data is required by the resolver_component_tests_runner.py.template
         'resolver_component_test_cases':
             _resolver_test_cases(resolver_component_data),
-        'targets': [{
-            'name':
-                'resolver_component_test' + unsecure_build_config_suffix,
-            'build':
-                'test',
-            'language':
-                'c++',
-            'gtest':
-                False,
-            'run':
-                False,
-            'src': ['test/cpp/naming/resolver_component_test.cc'],
-            'platforms': ['linux', 'posix', 'mac', 'windows'],
-            'deps': [
-                'dns_test_util',
-                'grpc++_test_util' + unsecure_build_config_suffix,
-                'grpc_test_util' + unsecure_build_config_suffix,
-                'grpc++' + unsecure_build_config_suffix,
-                'grpc' + unsecure_build_config_suffix,
-                'gpr',
-                'grpc++_test_config',
-            ],
-        } for unsecure_build_config_suffix in ['_unsecure', '']] + [{
-            'name':
-                'resolver_component_tests_runner_invoker' +
-                unsecure_build_config_suffix,
-            'build':
-                'test',
-            'language':
-                'c++',
-            'gtest':
-                False,
-            'run':
-                True,
-            'src':
-                ['test/cpp/naming/resolver_component_tests_runner_invoker.cc'],
-            'platforms': ['linux', 'posix', 'mac'],
-            'deps': [
-                'grpc++_test_util',
-                'grpc_test_util',
-                'grpc++',
-                'grpc',
-                'gpr',
-                'grpc++_test_config',
-            ],
-            'args': [
-                '--test_bin_name=resolver_component_test%s' %
-                unsecure_build_config_suffix,
-                '--running_under_bazel=false',
-            ],
-        } for unsecure_build_config_suffix in ['_unsecure', '']] + [{
-            'name':
-                'address_sorting_test' + unsecure_build_config_suffix,
-            'build':
-                'test',
-            'language':
-                'c++',
-            'gtest':
-                True,
-            'run':
-                True,
-            'src': ['test/cpp/naming/address_sorting_test.cc'],
-            'platforms': ['linux', 'posix', 'mac', 'windows'],
-            'deps': [
-                'grpc++_test_util' + unsecure_build_config_suffix,
-                'grpc_test_util' + unsecure_build_config_suffix,
-                'grpc++' + unsecure_build_config_suffix,
-                'grpc' + unsecure_build_config_suffix,
-                'gpr',
-                'grpc++_test_config',
-            ],
-        } for unsecure_build_config_suffix in ['_unsecure', '']] + [
-            {
-                'name':
-                    'cancel_ares_query_test',
-                'build':
-                    'test',
-                'language':
-                    'c++',
-                'gtest':
-                    True,
-                'run':
-                    True,
-                'src': ['test/cpp/naming/cancel_ares_query_test.cc'],
-                'platforms': ['linux', 'posix', 'mac', 'windows'],
-                'deps': [
-                    'dns_test_util',
-                    'grpc++_test_util',
-                    'grpc_test_util',
-                    'grpc++',
-                    'grpc',
-                    'gpr',
-                    'grpc++_test_config',
-                ],
-            },
-        ]
     }
 
     print(yaml.dump(json))

test/cpp/qps/gen_build_yaml.py

@@ -29,8 +29,9 @@ sys.path.append(run_tests_root)
 import performance.scenario_config as scenario_config
 
 configs_from_yaml = yaml.load(
-    open(os.path.join(os.path.dirname(sys.argv[0]),
-                      '../../../build.yaml')))['configs'].keys()
+    open(
+        os.path.join(os.path.dirname(sys.argv[0]),
+                     '../../../build_handwritten.yaml')))['configs'].keys()
 
 
 def mutate_scenario(scenario_json, is_tsan):
@@ -87,6 +88,13 @@ def maybe_exclude_gcov(scenario_json):
     return []
 
 
+# Originally, this method was used to generate qps test cases for build.yaml,
+# but since the test cases are now extracted from bazel BUILD file,
+# this is not used for generating run_tests.py test cases anymore.
+# Nevertheless, the output is still used by json_run_localhost_scenario_gen.py
+# and qps_json_driver_scenario_gen.py to generate the scenario list for bazel.
+# TODO(jtattermusch): cleanup this file, so that it only generates data needed
+# by bazel.
 def generate_yaml():
     return {
         'tests':
@@ -187,6 +195,3 @@ def generate_yaml():
              for scenario_json in scenario_config.CXXLanguage().scenarios()
              if 'scalable' in scenario_json.get('CATEGORIES', [])]
     }
-
-
-print(yaml.dump(generate_yaml()))

third_party/abseil-cpp

@@ -1 +1 @@
-Subproject commit 37dd2562ec830d547a1524bb306be313ac3f2556
+Subproject commit b832dce8489ef7b6231384909fd9b68d5a5ff2b7

third_party/rake-compiler-dock/Dockerfile

@@ -1,22 +0,0 @@
-FROM larskanis/rake-compiler-dock-mri:0.7.2
-
-RUN find / -name rbconfig.rb | while read f ; do sed -i 's/0x0501/0x0600/' $f ; done
-RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done
-RUN find / -name libwinpthread.dll.a | xargs rm
-RUN find / -name libwinpthread-1.dll | xargs rm
-RUN find / -name *msvcrt-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
-RUN apt-get install -y g++-multilib
-
-# Make the system to have GLIBC 2.12 instead of 2.23 so that
-# generated ruby package can run on CentOS 6 with GLIBC 2.12
-RUN sed -i 's/__GLIBC_MINOR__\t23/__GLIBC_MINOR__\t12/' /usr/include/features.h
-
-# Use posix pthread for mingw so that C++ standard library for thread could be
-# available such as std::thread, std::mutex, so on.
-# https://sourceware.org/pthreads-win32/
-RUN printf "1\n" | update-alternatives --config x86_64-w64-mingw32-gcc && \
-    printf "1\n" | update-alternatives --config x86_64-w64-mingw32-g++ && \
-    printf "1\n" | update-alternatives --config i686-w64-mingw32-gcc && \
-    printf "1\n" | update-alternatives --config i686-w64-mingw32-g++
-
-CMD bash

third_party/rake-compiler-dock/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 Lars Kanis
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

third_party/rake-compiler-dock/README.md

@@ -1 +0,0 @@
-This is a modified Dockerfile taken from [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) for the purpose of building gRPC's ruby gem.

tools/bazel

@@ -24,12 +24,20 @@
 
 set -e
 
-# First of all, if DISABLE_BAZEL_WRAPPER is set, just use BAZEL_REAL as set by
-# https://github.com/bazelbuild/bazel/blob/master/scripts/packages/bazel.sh
-# that originally invoked this script.
-if [ "${BAZEL_REAL}" != "" ] && [ "${DISABLE_BAZEL_WRAPPER}" != "" ]
+# DISABLE_BAZEL_WRAPPER can be set to eliminate the wrapper logic
+if [ "${DISABLE_BAZEL_WRAPPER}" != "" ]
 then
-  exec -a "$0" "${BAZEL_REAL}" "$@"
+  if [ "${BAZEL_REAL}" != "" ]
+  then
+    # use BAZEL_REAL as set by
+    # https://github.com/bazelbuild/bazel/blob/master/scripts/packages/bazel.sh
+    # that originally invoked this script (this is what happens when you
+    # run "bazel" in our workspace)
+    exec -a "$0" "${BAZEL_REAL}" "$@"
+  else
+    # if BAZEL_REAL is not set, just invoke the default system bazel
+    exec bazel "$@"
+  fi
 fi
 
 VERSION=1.0.0

tools/buildgen/build-cleaner.py → tools/buildgen/build_cleaner.py

@@ -38,7 +38,7 @@ def repr_ordered_dict(dumper, odict):
 yaml.add_representer(collections.OrderedDict, repr_ordered_dict)
 
 
-def rebuild_as_ordered_dict(indict, special_keys):
+def _rebuild_as_ordered_dict(indict, special_keys):
     outdict = collections.OrderedDict()
     for key in sorted(indict.keys()):
         if '#' in key:
@@ -53,23 +53,22 @@ def rebuild_as_ordered_dict(indict, special_keys):
     return outdict
 
 
-def clean_elem(indict):
+def _clean_elem(indict):
     for name in ['public_headers', 'headers', 'src']:
         if name not in indict: continue
         inlist = indict[name]
         protos = list(x for x in inlist if os.path.splitext(x)[1] == '.proto')
         others = set(x for x in inlist if x not in protos)
         indict[name] = protos + sorted(others)
-    return rebuild_as_ordered_dict(indict, _ELEM_KEYS)
+    return _rebuild_as_ordered_dict(indict, _ELEM_KEYS)
 
 
-for filename in sys.argv[1:]:
-    with open(filename) as f:
-        js = yaml.load(f)
-    js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS)
+def cleaned_build_yaml_dict_as_string(indict):
+    """Takes dictionary which represents yaml file and returns the cleaned-up yaml string"""
+    js = _rebuild_as_ordered_dict(indict, _TOP_LEVEL_KEYS)
     for grp in ['filegroups', 'libs', 'targets']:
         if grp not in js: continue
-        js[grp] = sorted([clean_elem(x) for x in js[grp]],
+        js[grp] = sorted([_clean_elem(x) for x in js[grp]],
                          key=lambda x: (x.get('language', '_'), x['name']))
     output = yaml.dump(js, indent=2, width=80, default_flow_style=False)
     # massage out trailing whitespace
@@ -77,9 +76,20 @@ for filename in sys.argv[1:]:
     for line in output.splitlines():
         lines.append(line.rstrip() + '\n')
     output = ''.join(lines)
-    if TEST:
+    return output
+
+
+if __name__ == '__main__':
+    for filename in sys.argv[1:]:
         with open(filename) as f:
-            assert f.read() == output
-    else:
-        with open(filename, 'w') as f:
-            f.write(output)
+            js = yaml.load(f)
+        output = cleaned_build_yaml_dict_as_string(js)
+        if TEST:
+            with open(filename) as f:
+                if not f.read() == output:
+                    raise Exception(
+                        'Looks like build-cleaner.py has not been run for file "%s"?'
+                        % filename)
+        else:
+            with open(filename, 'w') as f:
+                f.write(output)

tools/buildgen/extract_metadata_from_bazel_xml.py

@@ -0,0 +1,943 @@
+#!/usr/bin/env python
+# Copyright 2020 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import subprocess
+import yaml
+import xml.etree.ElementTree as ET
+import os
+import sys
+import build_cleaner
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+os.chdir(_ROOT)
+
+
+def _bazel_query_xml_tree(query):
+    """Get xml output of bazel query invocation, parsed as XML tree"""
+    output = subprocess.check_output(
+        ['tools/bazel', 'query', '--noimplicit_deps', '--output', 'xml', query])
+    return ET.fromstring(output)
+
+
+def _rule_dict_from_xml_node(rule_xml_node):
+    result = {
+        'class': rule_xml_node.attrib.get('class'),
+        'name': rule_xml_node.attrib.get('name'),
+        'srcs': [],
+        'hdrs': [],
+        'deps': [],
+        'data': [],
+        'tags': [],
+        'args': [],
+        'generator_function': None,
+        'size': None,
+    }
+    for child in rule_xml_node:
+        # all the metadata we want is stored under "list" tags
+        if child.tag == 'list':
+            list_name = child.attrib['name']
+            if list_name in ['srcs', 'hdrs', 'deps', 'data', 'tags', 'args']:
+                result[list_name] += [item.attrib['value'] for item in child]
+        if child.tag == 'string':
+            string_name = child.attrib['name']
+            if string_name in ['generator_function', 'size']:
+                result[string_name] = child.attrib['value']
+    return result
+
+
+def _extract_rules_from_bazel_xml(xml_tree):
+    result = {}
+    for child in xml_tree:
+        if child.tag == 'rule':
+            rule_dict = _rule_dict_from_xml_node(child)
+            rule_clazz = rule_dict['class']
+            rule_name = rule_dict['name']
+            if rule_clazz in [
+                    'cc_library', 'cc_binary', 'cc_test', 'cc_proto_library',
+                    'proto_library'
+            ]:
+                if rule_name in result:
+                    raise Exception('Rule %s already present' % rule_name)
+                result[rule_name] = rule_dict
+    return result
+
+
+def _get_bazel_label(target_name):
+    if ':' in target_name:
+        return '//%s' % target_name
+    else:
+        return '//:%s' % target_name
+
+
+def _extract_source_file_path(label):
+    """Gets relative path to source file from bazel deps listing"""
+    if label.startswith('//'):
+        label = label[len('//'):]
+    # labels in form //:src/core/lib/surface/call_test_only.h
+    if label.startswith(':'):
+        label = label[len(':'):]
+    # labels in form //test/core/util:port.cc
+    label = label.replace(':', '/')
+    return label
+
+
+def _extract_public_headers(bazel_rule):
+    """Gets list of public headers from a bazel rule"""
+    result = []
+    for dep in bazel_rule['hdrs']:
+        if dep.startswith('//:include/') and dep.endswith('.h'):
+            result.append(_extract_source_file_path(dep))
+    return list(sorted(result))
+
+
+def _extract_nonpublic_headers(bazel_rule):
+    """Gets list of non-public headers from a bazel rule"""
+    result = []
+    for dep in bazel_rule['hdrs']:
+        if dep.startswith('//') and not dep.startswith(
+                '//:include/') and dep.endswith('.h'):
+            result.append(_extract_source_file_path(dep))
+    return list(sorted(result))
+
+
+def _extract_sources(bazel_rule):
+    """Gets list of source files from a bazel rule"""
+    result = []
+    for dep in bazel_rule['srcs']:
+        if dep.startswith('//') and (dep.endswith('.cc') or dep.endswith('.c')
+                                     or dep.endswith('.proto')):
+            result.append(_extract_source_file_path(dep))
+    return list(sorted(result))
+
+
+def _extract_deps(bazel_rule):
+    """Gets list of deps from from a bazel rule"""
+    return list(sorted(bazel_rule['deps']))
+
+
+def _create_target_from_bazel_rule(target_name, bazel_rules):
+    # extract the deps from bazel
+    bazel_rule = bazel_rules[_get_bazel_label(target_name)]
+    result = {
+        'name': target_name,
+        '_PUBLIC_HEADERS_BAZEL': _extract_public_headers(bazel_rule),
+        '_HEADERS_BAZEL': _extract_nonpublic_headers(bazel_rule),
+        '_SRC_BAZEL': _extract_sources(bazel_rule),
+        '_DEPS_BAZEL': _extract_deps(bazel_rule),
+    }
+    return result
+
+
+def _sort_by_build_order(lib_names, lib_dict, deps_key_name, verbose=False):
+    """Sort library names to form correct build order. Use metadata from lib_dict"""
+    # we find correct build order by performing a topological sort
+    # expected output: if library B depends on A, A should be listed first
+
+    # all libs that are not in the dictionary are considered external.
+    external_deps = list(
+        sorted(filter(lambda lib_name: lib_name not in lib_dict, lib_names)))
+    if verbose:
+        print('topo_ordering ' + str(lib_names))
+        print('    external_deps ' + str(external_deps))
+
+    result = list(external_deps)  # external deps will be listed first
+    while len(result) < len(lib_names):
+        more_results = []
+        for lib in lib_names:
+            if lib not in result:
+                dep_set = set(lib_dict[lib].get(deps_key_name, []))
+                dep_set = dep_set.intersection(lib_names)
+                # if lib only depends on what's already built, add it to the results
+                if not dep_set.difference(set(result)):
+                    more_results.append(lib)
+        if not more_results:
+            raise Exception(
+                'Cannot sort topologically, there seems to be a cyclic dependency'
+            )
+        if verbose:
+            print('    adding ' + str(more_results))
+        result = result + list(
+            sorted(more_results
+                  ))  # when build order doesn't matter, sort lexicographically
+    return result
+
+
+# TODO(jtattermusch): deduplicate with transitive_dependencies.py (which has a slightly different logic)
+def _populate_transitive_deps(bazel_rules):
+    """Add 'transitive_deps' field for each of the rules"""
+    transitive_deps = {}
+    for rule_name in bazel_rules.iterkeys():
+        transitive_deps[rule_name] = set(bazel_rules[rule_name]['deps'])
+
+    while True:
+        deps_added = 0
+        for rule_name in bazel_rules.iterkeys():
+            old_deps = transitive_deps[rule_name]
+            new_deps = set(old_deps)
+            for dep_name in old_deps:
+                new_deps.update(transitive_deps.get(dep_name, set()))
+            deps_added += len(new_deps) - len(old_deps)
+            transitive_deps[rule_name] = new_deps
+        # if none of the transitive dep sets has changed, we're done
+        if deps_added == 0:
+            break
+
+    for rule_name, bazel_rule in bazel_rules.iteritems():
+        bazel_rule['transitive_deps'] = list(sorted(transitive_deps[rule_name]))
+
+
+def _external_dep_name_from_bazel_dependency(bazel_dep):
+    """Returns name of dependency if external bazel dependency is provided or None"""
+    if bazel_dep.startswith('@com_google_absl//'):
+        # special case for add dependency on one of the absl libraries (there is not just one absl library)
+        prefixlen = len('@com_google_absl//')
+        return bazel_dep[prefixlen:]
+    elif bazel_dep == '//external:upb_lib':
+        return 'upb'
+    elif bazel_dep == '//external:benchmark':
+        return 'benchmark'
+    else:
+        # all the other external deps such as gflags, protobuf, cares, zlib
+        # don't need to be listed explicitly, they are handled automatically
+        # by the build system (make, cmake)
+        return None
+
+
+def _expand_intermediate_deps(target_dict, public_dep_names, bazel_rules):
+    # Some of the libraries defined by bazel won't be exposed in build.yaml
+    # We call these "intermediate" dependencies. This method expands
+    # the intermediate deps for given target (populates library's
+    # headers, sources and dicts as if the intermediate dependency never existed)
+
+    # use this dictionary to translate from bazel labels to dep names
+    bazel_label_to_dep_name = {}
+    for dep_name in public_dep_names:
+        bazel_label_to_dep_name[_get_bazel_label(dep_name)] = dep_name
+
+    target_name = target_dict['name']
+    bazel_deps = target_dict['_DEPS_BAZEL']
+
+    # initial values
+    public_headers = set(target_dict['_PUBLIC_HEADERS_BAZEL'])
+    headers = set(target_dict['_HEADERS_BAZEL'])
+    src = set(target_dict['_SRC_BAZEL'])
+    deps = set()
+
+    expansion_blacklist = set()
+    to_expand = set(bazel_deps)
+    while to_expand:
+
+        # start with the last dependency to be built
+        build_order = _sort_by_build_order(list(to_expand), bazel_rules,
+                                           'transitive_deps')
+
+        bazel_dep = build_order[-1]
+        to_expand.remove(bazel_dep)
+
+        is_public = bazel_dep in bazel_label_to_dep_name
+        external_dep_name_maybe = _external_dep_name_from_bazel_dependency(
+            bazel_dep)
+
+        if is_public:
+            # this is not an intermediate dependency we so we add it
+            # to the list of public dependencies to the list, in the right format
+            deps.add(bazel_label_to_dep_name[bazel_dep])
+
+            # we do not want to expand any intermediate libraries that are already included
+            # by the dependency we just added
+            expansion_blacklist.update(
+                bazel_rules[bazel_dep]['transitive_deps'])
+
+        elif external_dep_name_maybe:
+            deps.add(external_dep_name_maybe)
+
+        elif bazel_dep.startswith(
+                '//external:') or not bazel_dep.startswith('//'):
+            # all the other external deps can be skipped
+            pass
+
+        elif bazel_dep in expansion_blacklist:
+            # do not expand if a public dependency that depends on this has already been expanded
+            pass
+
+        else:
+            if bazel_dep in bazel_rules:
+                # this is an intermediate library, expand it
+                public_headers.update(
+                    _extract_public_headers(bazel_rules[bazel_dep]))
+                headers.update(
+                    _extract_nonpublic_headers(bazel_rules[bazel_dep]))
+                src.update(_extract_sources(bazel_rules[bazel_dep]))
+
+                new_deps = _extract_deps(bazel_rules[bazel_dep])
+                to_expand.update(new_deps)
+            else:
+                raise Exception(bazel_dep + ' not in bazel_rules')
+
+    # make the 'deps' field transitive, but only list non-intermediate deps and selected external deps
+    bazel_transitive_deps = bazel_rules[_get_bazel_label(
+        target_name)]['transitive_deps']
+    for transitive_bazel_dep in bazel_transitive_deps:
+        public_name = bazel_label_to_dep_name.get(transitive_bazel_dep, None)
+        if public_name:
+            deps.add(public_name)
+        external_dep_name_maybe = _external_dep_name_from_bazel_dependency(
+            transitive_bazel_dep)
+        if external_dep_name_maybe:
+            # expanding all absl libraries is technically correct but creates too much noise
+            if not external_dep_name_maybe.startswith('absl'):
+                deps.add(external_dep_name_maybe)
+
+    target_dict['public_headers'] = list(sorted(public_headers))
+    target_dict['headers'] = list(sorted(headers))
+    target_dict['src'] = list(sorted(src))
+    target_dict['deps'] = list(sorted(deps))
+
+
+def _generate_build_metadata(build_extra_metadata, bazel_rules):
+    lib_names = build_extra_metadata.keys()
+    result = {}
+
+    for lib_name in lib_names:
+        lib_dict = _create_target_from_bazel_rule(lib_name, bazel_rules)
+
+        _expand_intermediate_deps(lib_dict, lib_names, bazel_rules)
+
+        # populate extra properties from build metadata
+        lib_dict.update(build_extra_metadata.get(lib_name, {}))
+
+        # store to results
+        result[lib_name] = lib_dict
+
+    # rename some targets to something else
+    # this needs to be made after we're done with most of processing logic
+    # otherwise the already-renamed libraries will have different names than expected
+    for lib_name in lib_names:
+        to_name = build_extra_metadata.get(lib_name, {}).get('_RENAME', None)
+        if to_name:
+            # store lib under the new name and also change its 'name' property
+            if to_name in result:
+                raise Exception('Cannot rename target ' + lib_name + ', ' +
+                                to_name + ' already exists.')
+            lib_dict = result.pop(lib_name)
+            lib_dict['name'] = to_name
+            result[to_name] = lib_dict
+
+            # dep names need to be updated as well
+            for lib_dict_to_update in result.values():
+                lib_dict_to_update['deps'] = list(
+                    map(lambda dep: to_name if dep == lib_name else dep,
+                        lib_dict_to_update['deps']))
+
+    # make sure deps are listed in reverse topological order (e.g. "grpc gpr" and not "gpr grpc")
+    for lib_dict in result.itervalues():
+        lib_dict['deps'] = list(
+            reversed(_sort_by_build_order(lib_dict['deps'], result, 'deps')))
+
+    return result
+
+
+def _convert_to_build_yaml_like(lib_dict):
+    lib_names = list(
+        filter(
+            lambda lib_name: lib_dict[lib_name].get('_TYPE', 'library') ==
+            'library', lib_dict.keys()))
+    target_names = list(
+        filter(
+            lambda lib_name: lib_dict[lib_name].get('_TYPE', 'library') ==
+            'target', lib_dict.keys()))
+    test_names = list(
+        filter(
+            lambda lib_name: lib_dict[lib_name].get('_TYPE', 'library') ==
+            'test', lib_dict.keys()))
+
+    # list libraries and targets in predefined order
+    lib_list = list(map(lambda lib_name: lib_dict[lib_name], lib_names))
+    target_list = list(map(lambda lib_name: lib_dict[lib_name], target_names))
+    test_list = list(map(lambda lib_name: lib_dict[lib_name], test_names))
+
+    # get rid of temporary private fields prefixed with "_" and some other useless fields
+    for lib in lib_list:
+        for field_to_remove in filter(lambda k: k.startswith('_'), lib.keys()):
+            lib.pop(field_to_remove, None)
+    for target in target_list:
+        for field_to_remove in filter(lambda k: k.startswith('_'),
+                                      target.keys()):
+            target.pop(field_to_remove, None)
+        target.pop('public_headers',
+                   None)  # public headers make no sense for targets
+    for test in test_list:
+        for field_to_remove in filter(lambda k: k.startswith('_'), test.keys()):
+            test.pop(field_to_remove, None)
+        test.pop('public_headers',
+                 None)  # public headers make no sense for tests
+
+    build_yaml_like = {
+        'libs': lib_list,
+        'filegroups': [],
+        'targets': target_list,
+        'tests': test_list,
+    }
+    return build_yaml_like
+
+
+def _extract_cc_tests(bazel_rules):
+    """Gets list of cc_test tests from bazel rules"""
+    result = []
+    for bazel_rule in bazel_rules.itervalues():
+        if bazel_rule['class'] == 'cc_test':
+            test_name = bazel_rule['name']
+            if test_name.startswith('//'):
+                prefixlen = len('//')
+                result.append(test_name[prefixlen:])
+    return list(sorted(result))
+
+
+def _filter_cc_tests(tests):
+    """Filters out tests that we don't want or we cannot build them reasonably"""
+
+    # most qps tests are autogenerated, we are fine without them
+    tests = list(
+        filter(lambda test: not test.startswith('test/cpp/qps:'), tests))
+
+    # we have trouble with census dependency outside of bazel
+    tests = list(
+        filter(lambda test: not test.startswith('test/cpp/ext/filters/census:'),
+               tests))
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/cpp/microbenchmarks:bm_opencensus_plugin'), tests))
+
+    # missing opencensus/stats/stats.h
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/cpp/end2end:server_load_reporting_end2end_test'), tests))
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/cpp/server/load_reporter:lb_load_reporter_test'), tests))
+
+    # The test uses --running_under_bazel cmdline argument
+    # To avoid the trouble needing to adjust it, we just skip the test
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/cpp/naming:resolver_component_tests_runner_invoker'),
+            tests))
+
+    # the test requires 'client_crash_test_server' to be built
+    tests = list(
+        filter(
+            lambda test: not test.startswith('test/cpp/end2end:time_change_test'
+                                            ), tests))
+
+    # the test requires 'client_crash_test_server' to be built
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/cpp/end2end:client_crash_test'), tests))
+
+    # the test requires 'server_crash_test_client' to be built
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/cpp/end2end:server_crash_test'), tests))
+
+    # test never existed under build.yaml and it fails -> skip it
+    tests = list(
+        filter(
+            lambda test: not test.startswith(
+                'test/core/tsi:ssl_session_cache_test'), tests))
+
+    return tests
+
+
+def _generate_build_extra_metadata_for_tests(tests, bazel_rules):
+    test_metadata = {}
+    for test in tests:
+        test_dict = {'build': 'test', '_TYPE': 'target'}
+
+        bazel_rule = bazel_rules[_get_bazel_label(test)]
+
+        bazel_tags = bazel_rule['tags']
+        if 'manual' in bazel_tags:
+            # don't run the tests marked as "manual"
+            test_dict['run'] = False
+
+        if 'no_uses_polling' in bazel_tags:
+            test_dict['uses_polling'] = False
+
+        if 'grpc_fuzzer' == bazel_rule['generator_function']:
+            # currently we hand-list fuzzers instead of generating them automatically
+            # because there's no way to obtain maxlen property from bazel BUILD file.
+            print('skipping fuzzer ' + test)
+            continue
+
+        # if any tags that restrict platform compatibility are present,
+        # generate the "platforms" field accordingly
+        # TODO(jtattermusch): there is also a "no_linux" tag, but we cannot take
+        # it into account as it is applied by grpc_cc_test when poller expansion
+        # is made (for tests where uses_polling=True). So for now, we just
+        # assume all tests are compatible with linux and ignore the "no_linux" tag
+        # completely.
+        known_platform_tags = set(['no_windows', 'no_mac'])
+        if set(bazel_tags).intersection(known_platform_tags):
+            platforms = []
+            # assume all tests are compatible with linux and posix
+            platforms.append('linux')
+            platforms.append(
+                'posix')  # there is no posix-specific tag in bazel BUILD
+            if not 'no_mac' in bazel_tags:
+                platforms.append('mac')
+            if not 'no_windows' in bazel_tags:
+                platforms.append('windows')
+            test_dict['platforms'] = platforms
+
+        if '//external:benchmark' in bazel_rule['transitive_deps']:
+            test_dict['benchmark'] = True
+            test_dict['defaults'] = 'benchmark'
+
+        cmdline_args = bazel_rule['args']
+        if cmdline_args:
+            test_dict['args'] = list(cmdline_args)
+
+        uses_gtest = '//external:gtest' in bazel_rule['transitive_deps']
+        if uses_gtest:
+            test_dict['gtest'] = True
+
+        if test.startswith('test/cpp') or uses_gtest:
+            test_dict['language'] = 'c++'
+
+        elif test.startswith('test/core'):
+            test_dict['language'] = 'c'
+        else:
+            raise Exception('wrong test' + test)
+
+        # short test name without the path.
+        # There can be name collisions, but we will resolve them later
+        simple_test_name = os.path.basename(_extract_source_file_path(test))
+        test_dict['_RENAME'] = simple_test_name
+
+        test_metadata[test] = test_dict
+
+    # detect duplicate test names
+    tests_by_simple_name = {}
+    for test_name, test_dict in test_metadata.iteritems():
+        simple_test_name = test_dict['_RENAME']
+        if not simple_test_name in tests_by_simple_name:
+            tests_by_simple_name[simple_test_name] = []
+        tests_by_simple_name[simple_test_name].append(test_name)
+
+    # choose alternative names for tests with a name collision
+    for collision_list in tests_by_simple_name.itervalues():
+        if len(collision_list) > 1:
+            for test_name in collision_list:
+                long_name = test_name.replace('/', '_').replace(':', '_')
+                print(
+                    'short name of "%s" collides with another test, renaming to %s'
+                    % (test_name, long_name))
+                test_metadata[test_name]['_RENAME'] = long_name
+
+    # TODO(jtattermusch): in bazel, add "_test" suffix to the test names
+    # test does not have "_test" suffix: fling
+    # test does not have "_test" suffix: fling_stream
+    # test does not have "_test" suffix: client_ssl
+    # test does not have "_test" suffix: handshake_server_with_readahead_handshaker
+    # test does not have "_test" suffix: handshake_verify_peer_options
+    # test does not have "_test" suffix: server_ssl
+
+    return test_metadata
+
+
+# extra metadata that will be used to construct build.yaml
+# there are mostly extra properties that we weren't able to obtain from the bazel build
+# _TYPE: whether this is library, target or test
+# _RENAME: whether this target should be renamed to a different name (to match expectations of make and cmake builds)
+# NOTE: secure is 'check' by default, so setting secure = False below does matter
+_BUILD_EXTRA_METADATA = {
+    'third_party/address_sorting:address_sorting': {
+        'language': 'c',
+        'build': 'all',
+        'secure': False,
+        '_RENAME': 'address_sorting'
+    },
+    'gpr': {
+        'language': 'c',
+        'build': 'all',
+        'secure': False
+    },
+    'grpc': {
+        'language': 'c',
+        'build': 'all',
+        'baselib': True,
+        'secure': True,
+        'dll': True,
+        'generate_plugin_registry': True
+    },
+    'grpc++': {
+        'language': 'c++',
+        'build': 'all',
+        'baselib': True,
+        'dll': True
+    },
+    'grpc++_alts': {
+        'language': 'c++',
+        'build': 'all',
+        'baselib': True
+    },
+    'grpc++_error_details': {
+        'language': 'c++',
+        'build': 'all'
+    },
+    'grpc++_reflection': {
+        'language': 'c++',
+        'build': 'all'
+    },
+    'grpc++_unsecure': {
+        'language': 'c++',
+        'build': 'all',
+        'baselib': True,
+        'secure': False,
+        'dll': True
+    },
+    # TODO(jtattermusch): do we need to set grpc_csharp_ext's LDFLAGS for wrapping memcpy in the same way as in build.yaml?
+    'grpc_csharp_ext': {
+        'language': 'c',
+        'build': 'all',
+        'dll': 'only'
+    },
+    'grpc_unsecure': {
+        'language': 'c',
+        'build': 'all',
+        'baselib': True,
+        'secure': False,
+        'dll': True,
+        'generate_plugin_registry': True
+    },
+    'grpcpp_channelz': {
+        'language': 'c++',
+        'build': 'all'
+    },
+    'src/compiler:grpc_plugin_support': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_RENAME': 'grpc_plugin_support'
+    },
+    'src/compiler:grpc_cpp_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_cpp_plugin'
+    },
+    'src/compiler:grpc_csharp_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_csharp_plugin'
+    },
+    'src/compiler:grpc_node_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_node_plugin'
+    },
+    'src/compiler:grpc_objective_c_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_objective_c_plugin'
+    },
+    'src/compiler:grpc_php_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_php_plugin'
+    },
+    'src/compiler:grpc_python_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_python_plugin'
+    },
+    'src/compiler:grpc_ruby_plugin': {
+        'language': 'c++',
+        'build': 'protoc',
+        'secure': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_ruby_plugin'
+    },
+
+    # TODO(jtattermusch): consider adding grpc++_core_stats
+
+    # test support libraries
+    'test/core/util:grpc_test_util': {
+        'language': 'c',
+        'build': 'private',
+        '_RENAME': 'grpc_test_util'
+    },
+    'test/core/util:grpc_test_util_unsecure': {
+        'language': 'c',
+        'build': 'private',
+        'secure': False,
+        '_RENAME': 'grpc_test_util_unsecure'
+    },
+    # TODO(jtattermusch): consider adding grpc++_test_util_unsecure - it doesn't seem to be used by bazel build (don't forget to set secure: False)
+    'test/cpp/util:test_config': {
+        'language': 'c++',
+        'build': 'private',
+        '_RENAME': 'grpc++_test_config'
+    },
+    'test/cpp/util:test_util': {
+        'language': 'c++',
+        'build': 'private',
+        '_RENAME': 'grpc++_test_util'
+    },
+
+    # end2end test support libraries
+    'test/core/end2end:end2end_tests': {
+        'language': 'c',
+        'build': 'private',
+        'secure': True,
+        '_RENAME': 'end2end_tests'
+    },
+    'test/core/end2end:end2end_nosec_tests': {
+        'language': 'c',
+        'build': 'private',
+        'secure': False,
+        '_RENAME': 'end2end_nosec_tests'
+    },
+
+    # benchmark support libraries
+    'test/cpp/microbenchmarks:helpers': {
+        'language': 'c++',
+        'build': 'test',
+        'defaults': 'benchmark',
+        '_RENAME': 'benchmark_helpers'
+    },
+    'test/cpp/interop:interop_client': {
+        'language': 'c++',
+        'build': 'test',
+        'run': False,
+        '_TYPE': 'target',
+        '_RENAME': 'interop_client'
+    },
+    'test/cpp/interop:interop_server': {
+        'language': 'c++',
+        'build': 'test',
+        'run': False,
+        '_TYPE': 'target',
+        '_RENAME': 'interop_server'
+    },
+    'test/cpp/interop:http2_client': {
+        'language': 'c++',
+        'build': 'test',
+        'run': False,
+        '_TYPE': 'target',
+        '_RENAME': 'http2_client'
+    },
+    'test/cpp/qps:qps_json_driver': {
+        'language': 'c++',
+        'build': 'test',
+        'run': False,
+        '_TYPE': 'target',
+        '_RENAME': 'qps_json_driver'
+    },
+    'test/cpp/qps:qps_worker': {
+        'language': 'c++',
+        'build': 'test',
+        'run': False,
+        '_TYPE': 'target',
+        '_RENAME': 'qps_worker'
+    },
+    'test/cpp/util:grpc_cli': {
+        'language': 'c++',
+        'build': 'test',
+        'run': False,
+        '_TYPE': 'target',
+        '_RENAME': 'grpc_cli'
+    },
+
+    # TODO(jtattermusch): create_jwt and verify_jwt breaks distribtests because it depends on grpc_test_utils and thus requires tests to be built
+    # For now it's ok to disable them as these binaries aren't very useful anyway.
+    #'test/core/security:create_jwt': { 'language': 'c', 'build': 'tool', '_TYPE': 'target', '_RENAME': 'grpc_create_jwt' },
+    #'test/core/security:verify_jwt': { 'language': 'c', 'build': 'tool', '_TYPE': 'target', '_RENAME': 'grpc_verify_jwt' },
+
+    # TODO(jtattermusch): add remaining tools such as grpc_print_google_default_creds_token (they are not used by bazel build)
+
+    # Fuzzers
+    'test/core/security:alts_credentials_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/security/corpus/alts_credentials_corpus'],
+        'maxlen': 2048,
+        '_TYPE': 'target',
+        '_RENAME': 'alts_credentials_fuzzer'
+    },
+    'test/core/end2end/fuzzers:client_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/end2end/fuzzers/client_fuzzer_corpus'],
+        'maxlen': 2048,
+        'dict': 'test/core/end2end/fuzzers/hpack.dictionary',
+        '_TYPE': 'target',
+        '_RENAME': 'client_fuzzer'
+    },
+    'test/core/transport/chttp2:hpack_parser_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/transport/chttp2/hpack_parser_corpus'],
+        'maxlen': 512,
+        'dict': 'test/core/end2end/fuzzers/hpack.dictionary',
+        '_TYPE': 'target',
+        '_RENAME': 'hpack_parser_fuzzer_test'
+    },
+    'test/core/http:request_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/http/request_corpus'],
+        'maxlen': 2048,
+        '_TYPE': 'target',
+        '_RENAME': 'http_request_fuzzer_test'
+    },
+    'test/core/http:response_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/http/response_corpus'],
+        'maxlen': 2048,
+        '_TYPE': 'target',
+        '_RENAME': 'http_response_fuzzer_test'
+    },
+    'test/core/json:json_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/json/corpus'],
+        'maxlen': 512,
+        '_TYPE': 'target',
+        '_RENAME': 'json_fuzzer_test'
+    },
+    'test/core/nanopb:fuzzer_response': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/nanopb/corpus_response'],
+        'maxlen': 128,
+        '_TYPE': 'target',
+        '_RENAME': 'nanopb_fuzzer_response_test'
+    },
+    'test/core/nanopb:fuzzer_serverlist': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/nanopb/corpus_serverlist'],
+        'maxlen': 128,
+        '_TYPE': 'target',
+        '_RENAME': 'nanopb_fuzzer_serverlist_test'
+    },
+    'test/core/slice:percent_decode_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/slice/percent_decode_corpus'],
+        'maxlen': 32,
+        '_TYPE': 'target',
+        '_RENAME': 'percent_decode_fuzzer'
+    },
+    'test/core/slice:percent_encode_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/slice/percent_encode_corpus'],
+        'maxlen': 32,
+        '_TYPE': 'target',
+        '_RENAME': 'percent_encode_fuzzer'
+    },
+    'test/core/end2end/fuzzers:server_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/end2end/fuzzers/server_fuzzer_corpus'],
+        'maxlen': 2048,
+        'dict': 'test/core/end2end/fuzzers/hpack.dictionary',
+        '_TYPE': 'target',
+        '_RENAME': 'server_fuzzer'
+    },
+    'test/core/security:ssl_server_fuzzer': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/security/corpus/ssl_server_corpus'],
+        'maxlen': 2048,
+        '_TYPE': 'target',
+        '_RENAME': 'ssl_server_fuzzer'
+    },
+    'test/core/client_channel:uri_fuzzer_test': {
+        'language': 'c++',
+        'build': 'fuzzer',
+        'corpus_dirs': ['test/core/client_channel/uri_corpus'],
+        'maxlen': 128,
+        '_TYPE': 'target',
+        '_RENAME': 'uri_fuzzer_test'
+    },
+
+    # TODO(jtattermusch): these fuzzers had no build.yaml equivalent
+    # test/core/compression:message_compress_fuzzer
+    # test/core/compression:message_decompress_fuzzer
+    # test/core/compression:stream_compression_fuzzer
+    # test/core/compression:stream_decompression_fuzzer
+    # test/core/slice:b64_decode_fuzzer
+    # test/core/slice:b64_encode_fuzzer
+}
+
+# We need a complete picture of all the targets and dependencies we're interested in
+# so we run multiple bazel queries and merge the results.
+_BAZEL_DEPS_QUERIES = [
+    'deps("//test/...")',
+    'deps("//:all")',
+    'deps("//src/compiler/...")',
+    'deps("//src/proto/...")',
+]
+
+bazel_rules = {}
+for query in _BAZEL_DEPS_QUERIES:
+    bazel_rules.update(
+        _extract_rules_from_bazel_xml(_bazel_query_xml_tree(query)))
+
+_populate_transitive_deps(bazel_rules)
+
+tests = _filter_cc_tests(_extract_cc_tests(bazel_rules))
+test_metadata = _generate_build_extra_metadata_for_tests(tests, bazel_rules)
+
+all_metadata = {}
+all_metadata.update(_BUILD_EXTRA_METADATA)
+all_metadata.update(test_metadata)
+
+all_targets_dict = _generate_build_metadata(all_metadata, bazel_rules)
+build_yaml_like = _convert_to_build_yaml_like(all_targets_dict)
+
+# if a test uses source files from src/ directly, it's a little bit suspicious
+for tgt in build_yaml_like['targets']:
+    if tgt['build'] == 'test':
+        for src in tgt['src']:
+            if src.startswith('src/') and not src.endswith('.proto'):
+                print('source file from under "src/" tree used in test ' +
+                      tgt['name'] + ': ' + src)
+
+build_yaml_string = build_cleaner.cleaned_build_yaml_dict_as_string(
+    build_yaml_like)
+with open('build_autogenerated.yaml', 'w') as file:
+    file.write(build_yaml_string)

tools/buildgen/generate_build_additions.sh

@@ -23,12 +23,11 @@ gen_build_yaml_dirs="  \
   src/upb              \
   src/zlib             \
   src/c-ares           \
-  test/core/bad_client \
-  test/core/bad_ssl    \
-  test/core/end2end    \
+  test/core/end2end     \
   test/cpp/naming      \
-  test/cpp/qps         \
   tools/run_tests/lb_interop_tests"
+
+
 gen_build_files=""
 for gen_build_yaml in $gen_build_yaml_dirs
 do

tools/buildgen/generate_projects.py

@@ -39,7 +39,7 @@ args = argp.parse_args()
 
 json = args.build_files
 
-test = {} if 'TEST' in os.environ else None
+test = {} if os.environ.get('TEST', 'false') == 'true' else None
 
 plugins = sorted(glob.glob('tools/buildgen/plugins/*.py'))
 

tools/buildgen/generate_projects.sh

@@ -16,20 +16,25 @@
 
 set -e
 
-if [ "x$TEST" = "x" ] ; then
-  TEST=false
-fi
+export TEST=${TEST:-false}
 
+echo "Generating build_autogenerated.yaml from bazel BUILD file"
+rm -f build_autogenerated.yaml
+python tools/buildgen/extract_metadata_from_bazel_xml.py
 
 cd `dirname $0`/../..
 mako_renderer=tools/buildgen/mako_renderer.py
 
-if [ "x$TEST" != "x" ] ; then
-  tools/buildgen/build-cleaner.py build.yaml
-fi
+tools/buildgen/build_cleaner.py build_handwritten.yaml
+
+# check build_autogenerated.yaml is already in its "clean" form
+TEST=true tools/buildgen/build_cleaner.py build_autogenerated.yaml
 
 . tools/buildgen/generate_build_additions.sh
 
-python tools/buildgen/generate_projects.py build.yaml $gen_build_files $*
+# Instead of generating from a single build.yaml, we've split it into
+# - build_handwritten.yaml: manually written metadata
+# - build_autogenerated.yaml: generated from bazel BUILD file
+python tools/buildgen/generate_projects.py build_handwritten.yaml build_autogenerated.yaml $gen_build_files $*
 
 rm $gen_build_files

tools/buildgen/plugins/make_fuzzer_tests.py

@@ -30,6 +30,14 @@ def mako_plugin(dictionary):
                 'test/core/util/one_corpus_entry_fuzzer.cc')
             new_target['own_src'].append(
                 'test/core/util/one_corpus_entry_fuzzer.cc')
+
+            # avoid having two main() methods
+            to_remove = 'test/core/util/fuzzer_corpus_test.cc'
+            if to_remove in new_target['src']:
+                new_target['src'].remove(to_remove)
+            if to_remove in new_target['own_src']:
+                new_target['own_src'].remove(to_remove)
+
             targets.append(new_target)
             for corpus in new_target['corpus_dirs']:
                 for fn in sorted(glob.glob('%s/*' % corpus)):

tools/distrib/docker_for_windows.rb

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright 2016 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-def grpc_root()
-  File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-end
-
-def docker_for_windows_image()
-  require 'digest'
-
-  dockerfile = File.join(grpc_root, 'third_party', 'rake-compiler-dock', 'Dockerfile') 
-  dockerpath = File.dirname(dockerfile)
-  version = Digest::SHA1.file(dockerfile).hexdigest
-  image_name = 'rake-compiler-dock_' + version
-  # if "DOCKERHUB_ORGANIZATION" env is set, we try to pull the pre-built
-  # rake-compiler-dock image from dockerhub rather then building from scratch.
-  if ENV.has_key?('DOCKERHUB_ORGANIZATION')
-    image_name = ENV['DOCKERHUB_ORGANIZATION'] + '/' + image_name
-    cmd = "docker pull #{image_name}"
-    puts cmd
-    system cmd
-    raise "Failed to pull the docker image." unless $? == 0
-  else
-    cmd = "docker build -t #{image_name} --file #{dockerfile} #{dockerpath}"
-    puts cmd
-    system cmd
-    raise "Failed to build the docker image." unless $? == 0
-  end
-  image_name
-end
-
-def docker_for_windows(args)
-  require 'rake_compiler_dock'
-
-  args = 'bash -l' if args.empty?
-
-  ENV['RAKE_COMPILER_DOCK_IMAGE'] = docker_for_windows_image
-
-  RakeCompilerDock.sh args
-end
-
-if __FILE__ == $0
-  docker_for_windows $*.join(' ')
-end