Merge pull request #19610 from mgravell/mgravell/petty-allocs
C# - remove delegate allocation and boxing from cancellation registrations
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dfa4e8..a68f5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -638,6 +638,9 @@
add_dependencies(buildtests_cxx grpc_tool_test)
add_dependencies(buildtests_cxx grpclb_api_test)
add_dependencies(buildtests_cxx grpclb_end2end_test)
+if(_gRPC_PLATFORM_LINUX)
+add_dependencies(buildtests_cxx grpclb_fallback_test)
+endif()
add_dependencies(buildtests_cxx h2_ssl_cert_test)
add_dependencies(buildtests_cxx h2_ssl_session_reuse_test)
add_dependencies(buildtests_cxx health_service_end2end_test)
@@ -14467,6 +14470,70 @@
endif (gRPC_BUILD_TESTS)
if (gRPC_BUILD_TESTS)
+if(_gRPC_PLATFORM_LINUX)
+
+add_executable(grpclb_fallback_test
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.h
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.h
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.h
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.cc
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.cc
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h
+ test/cpp/interop/grpclb_fallback_test.cc
+ third_party/googletest/googletest/src/gtest-all.cc
+ third_party/googletest/googlemock/src/gmock-all.cc
+)
+
+protobuf_generate_grpc_cpp(
+ src/proto/grpc/testing/empty.proto
+)
+protobuf_generate_grpc_cpp(
+ src/proto/grpc/testing/messages.proto
+)
+protobuf_generate_grpc_cpp(
+ src/proto/grpc/testing/test.proto
+)
+
+target_include_directories(grpclb_fallback_test
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
+ PRIVATE ${_gRPC_SSL_INCLUDE_DIR}
+ PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR}
+ PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR}
+ PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR}
+ PRIVATE ${_gRPC_CARES_INCLUDE_DIR}
+ PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR}
+ PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+ PRIVATE ${_gRPC_NANOPB_INCLUDE_DIR}
+ PRIVATE third_party/googletest/googletest/include
+ PRIVATE third_party/googletest/googletest
+ PRIVATE third_party/googletest/googlemock/include
+ PRIVATE third_party/googletest/googlemock
+ PRIVATE ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(grpclb_fallback_test
+ ${_gRPC_PROTOBUF_LIBRARIES}
+ ${_gRPC_ALLTARGETS_LIBRARIES}
+ grpc++_test_util
+ grpc_test_util
+ grpc++
+ grpc
+ gpr
+ grpc++_test_config
+ ${_gRPC_GFLAGS_LIBRARIES}
+)
+
+
+endif()
+endif (gRPC_BUILD_TESTS)
+if (gRPC_BUILD_TESTS)
add_executable(h2_ssl_cert_test
test/core/end2end/h2_ssl_cert_test.cc
diff --git a/Makefile b/Makefile
index 2a1bfad..952b201 100644
--- a/Makefile
+++ b/Makefile
@@ -1228,6 +1228,7 @@
grpc_tool_test: $(BINDIR)/$(CONFIG)/grpc_tool_test
grpclb_api_test: $(BINDIR)/$(CONFIG)/grpclb_api_test
grpclb_end2end_test: $(BINDIR)/$(CONFIG)/grpclb_end2end_test
+grpclb_fallback_test: $(BINDIR)/$(CONFIG)/grpclb_fallback_test
h2_ssl_cert_test: $(BINDIR)/$(CONFIG)/h2_ssl_cert_test
h2_ssl_session_reuse_test: $(BINDIR)/$(CONFIG)/h2_ssl_session_reuse_test
health_service_end2end_test: $(BINDIR)/$(CONFIG)/health_service_end2end_test
@@ -1697,6 +1698,7 @@
$(BINDIR)/$(CONFIG)/grpc_tool_test \
$(BINDIR)/$(CONFIG)/grpclb_api_test \
$(BINDIR)/$(CONFIG)/grpclb_end2end_test \
+ $(BINDIR)/$(CONFIG)/grpclb_fallback_test \
$(BINDIR)/$(CONFIG)/h2_ssl_cert_test \
$(BINDIR)/$(CONFIG)/h2_ssl_session_reuse_test \
$(BINDIR)/$(CONFIG)/health_service_end2end_test \
@@ -1862,6 +1864,7 @@
$(BINDIR)/$(CONFIG)/grpc_tool_test \
$(BINDIR)/$(CONFIG)/grpclb_api_test \
$(BINDIR)/$(CONFIG)/grpclb_end2end_test \
+ $(BINDIR)/$(CONFIG)/grpclb_fallback_test \
$(BINDIR)/$(CONFIG)/h2_ssl_cert_test \
$(BINDIR)/$(CONFIG)/h2_ssl_session_reuse_test \
$(BINDIR)/$(CONFIG)/health_service_end2end_test \
@@ -2366,6 +2369,8 @@
$(Q) $(BINDIR)/$(CONFIG)/grpclb_api_test || ( echo test grpclb_api_test failed ; exit 1 )
$(E) "[RUN] Testing grpclb_end2end_test"
$(Q) $(BINDIR)/$(CONFIG)/grpclb_end2end_test || ( echo test grpclb_end2end_test failed ; exit 1 )
+ $(E) "[RUN] Testing grpclb_fallback_test"
+ $(Q) $(BINDIR)/$(CONFIG)/grpclb_fallback_test || ( echo test grpclb_fallback_test failed ; exit 1 )
$(E) "[RUN] Testing h2_ssl_cert_test"
$(Q) $(BINDIR)/$(CONFIG)/h2_ssl_cert_test || ( echo test h2_ssl_cert_test failed ; exit 1 )
$(E) "[RUN] Testing h2_ssl_session_reuse_test"
@@ -17488,6 +17493,59 @@
$(OBJDIR)/$(CONFIG)/test/cpp/end2end/grpclb_end2end_test.o: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc
+GRPCLB_FALLBACK_TEST_SRC = \
+ $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
+ $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
+ $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
+ test/cpp/interop/grpclb_fallback_test.cc \
+
+GRPCLB_FALLBACK_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPCLB_FALLBACK_TEST_SRC))))
+ifeq ($(NO_SECURE),true)
+
+# You can't build secure targets if you don't have OpenSSL.
+
+$(BINDIR)/$(CONFIG)/grpclb_fallback_test: openssl_dep_error
+
+else
+
+
+
+
+ifeq ($(NO_PROTOBUF),true)
+
+# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
+
+$(BINDIR)/$(CONFIG)/grpclb_fallback_test: protobuf_dep_error
+
+else
+
+$(BINDIR)/$(CONFIG)/grpclb_fallback_test: $(PROTOBUF_DEP) $(GRPCLB_FALLBACK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+ $(E) "[LD] Linking $@"
+ $(Q) mkdir -p `dirname $@`
+ $(Q) $(LDXX) $(LDFLAGS) $(GRPCLB_FALLBACK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpclb_fallback_test
+
+endif
+
+endif
+
+$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/empty.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+
+$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+
+$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/grpclb_fallback_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+
+deps_grpclb_fallback_test: $(GRPCLB_FALLBACK_TEST_OBJS:.o=.dep)
+
+ifneq ($(NO_SECURE),true)
+ifneq ($(NO_DEPS),true)
+-include $(GRPCLB_FALLBACK_TEST_OBJS:.o=.dep)
+endif
+endif
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/grpclb_fallback_test.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
+
+
H2_SSL_CERT_TEST_SRC = \
test/core/end2end/h2_ssl_cert_test.cc \
diff --git a/build.yaml b/build.yaml
index 5915b9c..c36b3c7 100644
--- a/build.yaml
+++ b/build.yaml
@@ -5041,6 +5041,23 @@
- grpc++
- grpc
- gpr
+- name: grpclb_fallback_test
+ build: test
+ language: c++
+ src:
+ - src/proto/grpc/testing/empty.proto
+ - src/proto/grpc/testing/messages.proto
+ - src/proto/grpc/testing/test.proto
+ - test/cpp/interop/grpclb_fallback_test.cc
+ deps:
+ - grpc++_test_util
+ - grpc_test_util
+ - grpc++
+ - grpc
+ - gpr
+ - grpc++_test_config
+ platforms:
+ - linux
- name: h2_ssl_cert_test
gtest: true
build: test
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 48c3d00..3c9a8a2 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -1140,6 +1140,7 @@
void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t,
uint32_t goaway_error,
+ uint32_t last_stream_id,
const grpc_slice& goaway_text) {
// Discard the error from a previous goaway frame (if any)
if (t->goaway_error != GRPC_ERROR_NONE) {
@@ -1153,6 +1154,9 @@
GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE),
GRPC_ERROR_STR_RAW_BYTES, goaway_text);
+ GRPC_CHTTP2_IF_TRACING(
+ gpr_log(GPR_INFO, "transport %p got goaway with last stream id %d", t,
+ last_stream_id));
/* We want to log this irrespective of whether http tracing is enabled */
gpr_log(GPR_INFO, "%s: Got goaway [%d] err=%s", t->peer_string, goaway_error,
grpc_error_string(t->goaway_error));
@@ -1191,8 +1195,9 @@
grpc_chttp2_list_pop_waiting_for_concurrency(t, &s)) {
/* safe since we can't (legally) be parsing this stream yet */
GRPC_CHTTP2_IF_TRACING(gpr_log(
- GPR_INFO, "HTTP:%s: Allocating new grpc_chttp2_stream %p to id %d",
- t->is_client ? "CLI" : "SVR", s, t->next_stream_id));
+ GPR_INFO,
+ "HTTP:%s: Transport %p allocating new grpc_chttp2_stream %p to id %d",
+ t->is_client ? "CLI" : "SVR", t, s, t->next_stream_id));
GPR_ASSERT(s->id == 0);
s->id = t->next_stream_id;
@@ -1232,10 +1237,10 @@
return closure;
}
-static void null_then_run_closure(grpc_closure** closure, grpc_error* error) {
+static void null_then_sched_closure(grpc_closure** closure) {
grpc_closure* c = *closure;
*closure = nullptr;
- GRPC_CLOSURE_RUN(c, error);
+ GRPC_CLOSURE_SCHED(c, GRPC_ERROR_NONE);
}
void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t,
@@ -1902,7 +1907,7 @@
}
grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[0],
s->recv_initial_metadata);
- null_then_run_closure(&s->recv_initial_metadata_ready, GRPC_ERROR_NONE);
+ null_then_sched_closure(&s->recv_initial_metadata_ready);
}
}
@@ -1982,10 +1987,10 @@
s->unprocessed_incoming_frames_buffer_cached_length =
s->unprocessed_incoming_frames_buffer.length;
if (error == GRPC_ERROR_NONE && *s->recv_message != nullptr) {
- null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE);
+ null_then_sched_closure(&s->recv_message_ready);
} else if (s->published_metadata[1] != GRPC_METADATA_NOT_PUBLISHED) {
*s->recv_message = nullptr;
- null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE);
+ null_then_sched_closure(&s->recv_message_ready);
}
GRPC_ERROR_UNREF(error);
}
@@ -2051,8 +2056,7 @@
s->collecting_stats = nullptr;
grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[1],
s->recv_trailing_metadata);
- null_then_run_closure(&s->recv_trailing_metadata_finished,
- GRPC_ERROR_NONE);
+ null_then_sched_closure(&s->recv_trailing_metadata_finished);
}
}
}
@@ -2825,7 +2829,8 @@
static void connectivity_state_set(grpc_chttp2_transport* t,
grpc_connectivity_state state,
const char* reason) {
- GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "set connectivity_state=%d", state));
+ GRPC_CHTTP2_IF_TRACING(
+ gpr_log(GPR_INFO, "transport %p set connectivity_state=%d", t, state));
grpc_connectivity_state_set(&t->channel_callback.state_tracker, state,
reason);
}
diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc
index e901a6b..6dad349 100644
--- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc
@@ -139,7 +139,7 @@
p->state = GRPC_CHTTP2_GOAWAY_DEBUG;
if (is_last) {
grpc_chttp2_add_incoming_goaway(
- t, p->error_code,
+ t, p->error_code, p->last_stream_id,
grpc_slice_new(p->debug_data, p->debug_length, gpr_free));
p->debug_data = nullptr;
}
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index 4ab46f9..732bc38 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -752,6 +752,7 @@
void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t,
uint32_t goaway_error,
+ uint32_t last_stream_id,
const grpc_slice& goaway_text);
void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t);
diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h
index f8acb53..d268962 100644
--- a/src/core/lib/channel/channelz.h
+++ b/src/core/lib/channel/channelz.h
@@ -64,7 +64,7 @@
typedef InlinedVector<intptr_t, 10> ChildRefsList;
class SocketNode;
-typedef InlinedVector<SocketNode*, 10> ChildSocketsList;
+typedef InlinedVector<RefCountedPtr<SocketNode>, 10> ChildSocketsList;
namespace testing {
class CallCountingHelperPeer;
diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc
index abfa3be..0024f80 100644
--- a/src/core/lib/iomgr/tcp_server_windows.cc
+++ b/src/core/lib/iomgr/tcp_server_windows.cc
@@ -409,7 +409,7 @@
gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message);
gpr_free(utf8_message);
closesocket(sock);
- return NULL;
+ return GRPC_ERROR_NONE;
}
error = prepare_socket(sock, addr, &port);
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
index 8f6df48..6cd8600 100644
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@@ -1248,7 +1248,7 @@
channel_data* c = nullptr;
for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) {
if (c->socket_node != nullptr && c->socket_node->uuid() >= start_idx) {
- server_sockets->push_back(c->socket_node.get());
+ server_sockets->push_back(c->socket_node);
}
}
gpr_mu_unlock(&s->mu_global);
diff --git a/src/proto/grpc/testing/messages.proto b/src/proto/grpc/testing/messages.proto
index 3b966ae..4fed83f 100644
--- a/src/proto/grpc/testing/messages.proto
+++ b/src/proto/grpc/testing/messages.proto
@@ -48,6 +48,21 @@
string message = 2;
}
+// The type of route that a client took to reach a server w.r.t. gRPCLB.
+// The server must fill in "fallback" if it detects that the RPC reached
+// the server via the "gRPCLB fallback" path, and "backend" if it detects
+// that the RPC reached the server via "gRPCLB backend" path (i.e. if it got
+// the address of this server from the gRPCLB server BalanceLoad RPC). Exactly
+// how this detection is done is context and server dependant.
+enum GrpclbRouteType {
+ // Server didn't detect the route that a client took to reach it.
+ GRPCLB_ROUTE_TYPE_UNKNOWN = 0;
+ // Indicates that a client reached a server via gRPCLB fallback.
+ GRPCLB_ROUTE_TYPE_FALLBACK = 1;
+ // Indicates that a client reached a server as a gRPCLB-given backend.
+ GRPCLB_ROUTE_TYPE_BACKEND = 2;
+}
+
// Unary request.
message SimpleRequest {
// Desired payload type in the response from the server.
@@ -80,6 +95,9 @@
// Whether SimpleResponse should include server_id.
bool fill_server_id = 9;
+
+ // Whether SimpleResponse should include grpclb_route_type.
+ bool fill_grpclb_route_type = 10;
}
// Unary response, as configured by the request.
@@ -95,6 +113,8 @@
// Server ID. This must be unique among different server instances,
// but the same across all RPC's made to a particular server instance.
string server_id = 4;
+ // gRPCLB Path.
+ GrpclbRouteType grpclb_route_type = 5;
}
// Client-streaming request.
diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc
index f65783a..3c9e710 100644
--- a/test/core/iomgr/udp_server_test.cc
+++ b/test/core/iomgr/udp_server_test.cc
@@ -218,7 +218,7 @@
addr->sin_family = AF_INET;
GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, rcv_buf_size,
snd_buf_size, &handler_factory,
- g_num_listeners));
+ g_num_listeners) > 0);
grpc_udp_server_destroy(s, nullptr);
@@ -250,7 +250,7 @@
addr->sin_family = AF_INET;
GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, rcv_buf_size,
snd_buf_size, &handler_factory,
- g_num_listeners));
+ g_num_listeners) > 0);
GPR_ASSERT(socket_factory->number_of_socket_calls == g_num_listeners);
GPR_ASSERT(socket_factory->number_of_bind_calls == g_num_listeners);
@@ -278,7 +278,7 @@
addr->sin_family = AF_INET;
GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, rcv_buf_size,
snd_buf_size, &handler_factory,
- g_num_listeners));
+ g_num_listeners) > 0);
grpc_udp_server_start(s, nullptr, 0, nullptr);
GPR_ASSERT(g_number_of_starts == g_num_listeners);
@@ -312,7 +312,7 @@
addr->ss_family = AF_INET;
GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, rcv_buf_size,
snd_buf_size, &handler_factory,
- g_num_listeners));
+ g_num_listeners) > 0);
svrfd = grpc_udp_server_get_fd(s, 0);
GPR_ASSERT(svrfd >= 0);
diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD
index 802302b..e575ef8 100644
--- a/test/cpp/interop/BUILD
+++ b/test/cpp/interop/BUILD
@@ -39,6 +39,22 @@
)
grpc_cc_binary(
+ name = "grpclb_fallback_test",
+ srcs = [
+ "grpclb_fallback_test.cc",
+ ],
+ language = "C++",
+ deps = [
+ "//src/proto/grpc/testing:empty_proto",
+ "//src/proto/grpc/testing:messages_proto",
+ "//src/proto/grpc/testing:test_proto",
+ "//test/cpp/util:test_config",
+ "//test/cpp/util:test_util",
+ "//:grpc++",
+ ],
+)
+
+grpc_cc_binary(
name = "interop_server",
srcs = [
"interop_server_bootstrap.cc",
diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc
new file mode 100644
index 0000000..3622482
--- /dev/null
+++ b/test/cpp/interop/grpclb_fallback_test.cc
@@ -0,0 +1,272 @@
+/*
+ *
+ * Copyright 2019 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 <arpa/inet.h>
+#include <fcntl.h>
+#include <gflags/gflags.h>
+#include <inttypes.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <chrono>
+#include <cstdlib>
+#include <memory>
+#include <string>
+#include <thread>
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/channel_arguments.h>
+
+#include "src/core/lib/gpr/string.h"
+#include "src/core/lib/iomgr/socket_mutator.h"
+#include "src/proto/grpc/testing/empty.pb.h"
+#include "src/proto/grpc/testing/messages.pb.h"
+#include "src/proto/grpc/testing/test.grpc.pb.h"
+#include "src/proto/grpc/testing/test.pb.h"
+
+#include "test/cpp/util/test_config.h"
+#include "test/cpp/util/test_credentials_provider.h"
+
+DEFINE_string(custom_credentials_type, "", "User provided credentials type.");
+DEFINE_string(server_uri, "localhost:1000", "Server URI target");
+DEFINE_string(unroute_lb_and_backend_addrs_cmd, "exit 1",
+ "Shell command used to make LB and backend addresses unroutable");
+DEFINE_string(blackhole_lb_and_backend_addrs_cmd, "exit 1",
+ "Shell command used to make LB and backend addresses blackholed");
+DEFINE_string(
+ test_case, "",
+ "Test case to run. Valid options are:\n\n"
+ "fast_fallback_before_startup : fallback before establishing connection to "
+ "LB;\n"
+ "fast_fallback_after_startup : fallback after startup due to LB/backend "
+ "addresses becoming unroutable;\n"
+ "slow_fallback_before_startup : fallback before startup due to LB address "
+ "being blackholed;\n"
+ "slow_fallback_after_startup : fallback after startup due to LB/backend "
+ "addresses becoming blackholed;\n");
+
+using grpc::testing::GrpclbRouteType;
+using grpc::testing::SimpleRequest;
+using grpc::testing::SimpleResponse;
+using grpc::testing::TestService;
+
+namespace {
+
+enum RpcMode {
+ FailFast,
+ WaitForReady,
+};
+
+GrpclbRouteType DoRPCAndGetPath(TestService::Stub* stub, int deadline_seconds,
+ RpcMode rpc_mode) {
+ gpr_log(GPR_INFO, "DoRPCAndGetPath deadline_seconds:%d rpc_mode:%d",
+ deadline_seconds, rpc_mode);
+ SimpleRequest request;
+ SimpleResponse response;
+ grpc::ClientContext context;
+ if (rpc_mode == WaitForReady) {
+ context.set_wait_for_ready(true);
+ }
+ request.set_fill_grpclb_route_type(true);
+ std::chrono::system_clock::time_point deadline =
+ std::chrono::system_clock::now() + std::chrono::seconds(deadline_seconds);
+ context.set_deadline(deadline);
+ grpc::Status s = stub->UnaryCall(&context, request, &response);
+ if (!s.ok()) {
+ gpr_log(GPR_INFO, "DoRPCAndGetPath failed. status-message: %s",
+ s.error_message().c_str());
+ return GrpclbRouteType::GRPCLB_ROUTE_TYPE_UNKNOWN;
+ }
+ GPR_ASSERT(response.grpclb_route_type() ==
+ GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND ||
+ response.grpclb_route_type() ==
+ GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK);
+ gpr_log(GPR_INFO, "DoRPCAndGetPath done. grpclb_route_type:%d",
+ response.grpclb_route_type());
+ return response.grpclb_route_type();
+}
+
+GrpclbRouteType DoRPCAndGetPath(TestService::Stub* stub, int deadline_seconds) {
+ return DoRPCAndGetPath(stub, deadline_seconds, FailFast);
+}
+
+GrpclbRouteType DoWaitForReadyRPCAndGetPath(TestService::Stub* stub,
+ int deadline_seconds) {
+ return DoRPCAndGetPath(stub, deadline_seconds, WaitForReady);
+}
+
+bool TcpUserTimeoutMutateFd(int fd, grpc_socket_mutator* mutator) {
+ int timeout = 20000; // 20 seconds
+ gpr_log(GPR_INFO, "Setting socket option TCP_USER_TIMEOUT on fd: %d", fd);
+ if (0 != setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &timeout,
+ sizeof(timeout))) {
+ gpr_log(GPR_ERROR, "Failed to set socket option TCP_USER_TIMEOUT");
+ abort();
+ }
+ int newval;
+ socklen_t len = sizeof(newval);
+ if (0 != getsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len) ||
+ newval != timeout) {
+ gpr_log(GPR_ERROR, "Failed to get expected socket option TCP_USER_TIMEOUT");
+ abort();
+ }
+ return true;
+}
+
+int TcpUserTimeoutCompare(grpc_socket_mutator* a, grpc_socket_mutator* b) {
+ return 0;
+}
+
+void TcpUserTimeoutDestroy(grpc_socket_mutator* mutator) { gpr_free(mutator); }
+
+const grpc_socket_mutator_vtable kTcpUserTimeoutMutatorVtable =
+ grpc_socket_mutator_vtable{
+ .mutate_fd = TcpUserTimeoutMutateFd,
+ .compare = TcpUserTimeoutCompare,
+ .destroy = TcpUserTimeoutDestroy,
+ };
+
+std::unique_ptr<TestService::Stub> CreateFallbackTestStub() {
+ grpc::ChannelArguments channel_args;
+ grpc_socket_mutator* tcp_user_timeout_mutator =
+ static_cast<grpc_socket_mutator*>(
+ gpr_malloc(sizeof(tcp_user_timeout_mutator)));
+ grpc_socket_mutator_init(tcp_user_timeout_mutator,
+ &kTcpUserTimeoutMutatorVtable);
+ channel_args.SetSocketMutator(tcp_user_timeout_mutator);
+ // Allow LB policy to be configured by service config
+ channel_args.SetInt(GRPC_ARG_SERVICE_CONFIG_DISABLE_RESOLUTION, 0);
+ std::shared_ptr<grpc::ChannelCredentials> channel_creds =
+ grpc::testing::GetCredentialsProvider()->GetChannelCredentials(
+ FLAGS_custom_credentials_type, &channel_args);
+ return TestService::NewStub(
+ grpc::CreateCustomChannel(FLAGS_server_uri, channel_creds, channel_args));
+}
+
+void RunCommand(const std::string& command) {
+ gpr_log(GPR_INFO, "RunCommand: |%s|", command.c_str());
+ int out = std::system(command.c_str());
+ if (WIFEXITED(out)) {
+ int code = WEXITSTATUS(out);
+ if (code != 0) {
+ gpr_log(GPR_ERROR, "RunCommand failed exit code:%d command:|%s|", code,
+ command.c_str());
+ abort();
+ }
+ } else {
+ gpr_log(GPR_ERROR, "RunCommand failed command:|%s|", command.c_str());
+ abort();
+ }
+}
+
+void RunFallbackBeforeStartupTest(
+ const std::string& break_lb_and_backend_conns_cmd,
+ int per_rpc_deadline_seconds) {
+ std::unique_ptr<TestService::Stub> stub = CreateFallbackTestStub();
+ RunCommand(break_lb_and_backend_conns_cmd);
+ for (size_t i = 0; i < 30; i++) {
+ GrpclbRouteType grpclb_route_type =
+ DoRPCAndGetPath(stub.get(), per_rpc_deadline_seconds);
+ if (grpclb_route_type != GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK) {
+ gpr_log(GPR_ERROR, "Expected grpclb route type: FALLBACK. Got: %d",
+ grpclb_route_type);
+ abort();
+ }
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+ }
+}
+
+void DoFastFallbackBeforeStartup() {
+ RunFallbackBeforeStartupTest(FLAGS_unroute_lb_and_backend_addrs_cmd, 9);
+}
+
+void DoSlowFallbackBeforeStartup() {
+ RunFallbackBeforeStartupTest(FLAGS_blackhole_lb_and_backend_addrs_cmd, 20);
+}
+
+void RunFallbackAfterStartupTest(
+ const std::string& break_lb_and_backend_conns_cmd) {
+ std::unique_ptr<TestService::Stub> stub = CreateFallbackTestStub();
+ GrpclbRouteType grpclb_route_type = DoRPCAndGetPath(stub.get(), 20);
+ if (grpclb_route_type != GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND) {
+ gpr_log(GPR_ERROR, "Expected grpclb route type: BACKEND. Got: %d",
+ grpclb_route_type);
+ abort();
+ }
+ RunCommand(break_lb_and_backend_conns_cmd);
+ for (size_t i = 0; i < 40; i++) {
+ GrpclbRouteType grpclb_route_type =
+ DoWaitForReadyRPCAndGetPath(stub.get(), 1);
+ // Backends should be unreachable by now, otherwise the test is broken.
+ GPR_ASSERT(grpclb_route_type != GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND);
+ if (grpclb_route_type == GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK) {
+ gpr_log(GPR_INFO,
+ "Made one successul RPC to a fallback. Now expect the same for "
+ "the rest.");
+ break;
+ } else {
+ gpr_log(GPR_ERROR, "Retryable RPC failure on iteration: %" PRIdPTR, i);
+ }
+ }
+ for (size_t i = 0; i < 30; i++) {
+ GrpclbRouteType grpclb_route_type = DoRPCAndGetPath(stub.get(), 20);
+ if (grpclb_route_type != GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK) {
+ gpr_log(GPR_ERROR, "Expected grpclb route type: FALLBACK. Got: %d",
+ grpclb_route_type);
+ abort();
+ }
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+ }
+}
+
+void DoFastFallbackAfterStartup() {
+ RunFallbackAfterStartupTest(FLAGS_unroute_lb_and_backend_addrs_cmd);
+}
+
+void DoSlowFallbackAfterStartup() {
+ RunFallbackAfterStartupTest(FLAGS_blackhole_lb_and_backend_addrs_cmd);
+}
+} // namespace
+
+int main(int argc, char** argv) {
+ grpc::testing::InitTest(&argc, &argv, true);
+ gpr_log(GPR_INFO, "Testing: %s", FLAGS_test_case.c_str());
+ if (FLAGS_test_case == "fast_fallback_before_startup") {
+ DoFastFallbackBeforeStartup();
+ gpr_log(GPR_INFO, "DoFastFallbackBeforeStartup done!");
+ } else if (FLAGS_test_case == "slow_fallback_before_startup") {
+ DoSlowFallbackBeforeStartup();
+ gpr_log(GPR_INFO, "DoSlowFallbackBeforeStartup done!");
+ } else if (FLAGS_test_case == "fast_fallback_after_startup") {
+ DoFastFallbackAfterStartup();
+ gpr_log(GPR_INFO, "DoFastFallbackAfterStartup done!");
+ } else if (FLAGS_test_case == "slow_fallback_after_startup") {
+ DoSlowFallbackAfterStartup();
+ gpr_log(GPR_INFO, "DoSlowFallbackAfterStartup done!");
+ } else {
+ gpr_log(GPR_ERROR, "Invalid test case: %s", FLAGS_test_case.c_str());
+ abort();
+ }
+}
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 7a1baae..0b56c7b 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -4042,6 +4042,35 @@
"gpr",
"grpc",
"grpc++",
+ "grpc++_test_config",
+ "grpc++_test_util",
+ "grpc_test_util"
+ ],
+ "headers": [
+ "src/proto/grpc/testing/empty.grpc.pb.h",
+ "src/proto/grpc/testing/empty.pb.h",
+ "src/proto/grpc/testing/empty_mock.grpc.pb.h",
+ "src/proto/grpc/testing/messages.grpc.pb.h",
+ "src/proto/grpc/testing/messages.pb.h",
+ "src/proto/grpc/testing/messages_mock.grpc.pb.h",
+ "src/proto/grpc/testing/test.grpc.pb.h",
+ "src/proto/grpc/testing/test.pb.h",
+ "src/proto/grpc/testing/test_mock.grpc.pb.h"
+ ],
+ "is_filegroup": false,
+ "language": "c++",
+ "name": "grpclb_fallback_test",
+ "src": [
+ "test/cpp/interop/grpclb_fallback_test.cc"
+ ],
+ "third_party": false,
+ "type": "target"
+ },
+ {
+ "deps": [
+ "gpr",
+ "grpc",
+ "grpc++",
"grpc++_test",
"grpc_test_util"
],
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 2ac5292..f4757e5 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -4817,6 +4817,24 @@
"args": [],
"benchmark": false,
"ci_platforms": [
+ "linux"
+ ],
+ "cpu_cost": 1.0,
+ "exclude_configs": [],
+ "exclude_iomgrs": [],
+ "flaky": false,
+ "gtest": false,
+ "language": "c++",
+ "name": "grpclb_fallback_test",
+ "platforms": [
+ "linux"
+ ],
+ "uses_polling": true
+ },
+ {
+ "args": [],
+ "benchmark": false,
+ "ci_platforms": [
"linux",
"mac",
"posix",
