Merge pull request #20910 from AspirinSJL/disable_client_idle

Disable client_idle_filter
pull/21223/head
Vijay Pai 5 years ago committed by GitHub
commit acbbf45737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/core/ext/filters/client_idle/client_idle_filter.cc
  2. 3
      test/core/channel/channel_args_test.cc
  3. 4
      test/core/channel/minimal_stack_is_minimal_test.cc

@ -27,10 +27,9 @@
#include "src/core/lib/surface/channel_init.h" #include "src/core/lib/surface/channel_init.h"
#include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/http2_errors.h"
// The idle filter is enabled in client channel by default. // TODO(juanlishen): The idle filter is disabled in client channel by default
// Set GRPC_ARG_CLIENT_IDLE_TIMEOUT_MS to [1000, INT_MAX) in channel args to // due to b/143502997. Try to fix the bug and enable the filter by default.
// configure the idle timeout. #define DEFAULT_IDLE_TIMEOUT_MS INT_MAX
#define DEFAULT_IDLE_TIMEOUT_MS (30 /*minutes*/ * 60 * 1000)
// The user input idle timeout smaller than this would be capped to it. // The user input idle timeout smaller than this would be capped to it.
#define MIN_IDLE_TIMEOUT_MS (1 /*second*/ * 1000) #define MIN_IDLE_TIMEOUT_MS (1 /*second*/ * 1000)

@ -206,7 +206,8 @@ int main(int argc, char** argv) {
test_channel_create_with_args(); test_channel_create_with_args();
test_server_create_with_args(); test_server_create_with_args();
// This has to be the last test. // This has to be the last test.
test_channel_create_with_global_mutator(); // TODO(markdroth): re-enable this test once client_idle is re-enabled
// test_channel_create_with_global_mutator();
grpc_shutdown(); grpc_shutdown();
return 0; return 0;
} }

@ -100,8 +100,8 @@ int main(int argc, char** argv) {
errors += CHECK_STACK("chttp2", nullptr, GRPC_SERVER_CHANNEL, "server", errors += CHECK_STACK("chttp2", nullptr, GRPC_SERVER_CHANNEL, "server",
"message_size", "deadline", "http-server", "message_size", "deadline", "http-server",
"message_compress", "connected", NULL); "message_compress", "connected", NULL);
errors += CHECK_STACK(nullptr, nullptr, GRPC_CLIENT_CHANNEL, errors += CHECK_STACK(nullptr, nullptr, GRPC_CLIENT_CHANNEL, "client-channel",
"client_idle, client-channel", NULL); NULL);
GPR_ASSERT(errors == 0); GPR_ASSERT(errors == 0);
grpc_shutdown(); grpc_shutdown();

Loading…
Cancel
Save