Merge pull request #1633 from ctiller/create-pull-request/patch-d2af3fe

Automated fix for refs/heads/cg-idle

CMakeLists.txt

@@ -1756,6 +1756,7 @@ add_library(grpc
   src/core/ext/filters/census/grpc_context.cc
   src/core/ext/filters/channel_idle/channel_idle_filter.cc
   src/core/ext/filters/channel_idle/idle_filter_state.cc
+  src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   src/core/ext/filters/client_channel/backend_metric.cc
   src/core/ext/filters/client_channel/backup_poller.cc
   src/core/ext/filters/client_channel/channel_connectivity.cc
@@ -2820,6 +2821,7 @@ add_library(grpc_unsecure
   src/core/ext/filters/census/grpc_context.cc
   src/core/ext/filters/channel_idle/channel_idle_filter.cc
   src/core/ext/filters/channel_idle/idle_filter_state.cc
+  src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   src/core/ext/filters/client_channel/backend_metric.cc
   src/core/ext/filters/client_channel/backup_poller.cc
   src/core/ext/filters/client_channel/channel_connectivity.cc

Makefile

@@ -958,6 +958,7 @@ LIBGRPC_SRC = \
     src/core/ext/filters/census/grpc_context.cc \
     src/core/ext/filters/channel_idle/channel_idle_filter.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
+    src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
     src/core/ext/filters/client_channel/backend_metric.cc \
     src/core/ext/filters/client_channel/backup_poller.cc \
     src/core/ext/filters/client_channel/channel_connectivity.cc \
@@ -1872,6 +1873,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/ext/filters/census/grpc_context.cc \
     src/core/ext/filters/channel_idle/channel_idle_filter.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
+    src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
     src/core/ext/filters/client_channel/backend_metric.cc \
     src/core/ext/filters/client_channel/backup_poller.cc \
     src/core/ext/filters/client_channel/channel_connectivity.cc \

Package.swift

@@ -121,6 +121,8 @@ let package = Package(
         "src/core/ext/filters/channel_idle/channel_idle_filter.h",
         "src/core/ext/filters/channel_idle/idle_filter_state.cc",
         "src/core/ext/filters/channel_idle/idle_filter_state.h",
+        "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc",
+        "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h",
         "src/core/ext/filters/client_channel/backend_metric.cc",
         "src/core/ext/filters/client_channel/backend_metric.h",
         "src/core/ext/filters/client_channel/backup_poller.cc",

build_autogenerated.yaml

@@ -218,6 +218,7 @@ libs:
   - src/core/ext/filters/backend_metrics/backend_metric_provider.h
   - src/core/ext/filters/channel_idle/channel_idle_filter.h
   - src/core/ext/filters/channel_idle/idle_filter_state.h
+  - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
   - 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
@@ -1209,6 +1210,7 @@ libs:
   - src/core/ext/filters/census/grpc_context.cc
   - src/core/ext/filters/channel_idle/channel_idle_filter.cc
   - src/core/ext/filters/channel_idle/idle_filter_state.cc
+  - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   - src/core/ext/filters/client_channel/backend_metric.cc
   - src/core/ext/filters/client_channel/backup_poller.cc
   - src/core/ext/filters/client_channel/channel_connectivity.cc
@@ -2154,6 +2156,7 @@ libs:
   - src/core/ext/filters/backend_metrics/backend_metric_provider.h
   - src/core/ext/filters/channel_idle/channel_idle_filter.h
   - src/core/ext/filters/channel_idle/idle_filter_state.h
+  - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
   - 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
@@ -2625,6 +2628,7 @@ libs:
   - src/core/ext/filters/census/grpc_context.cc
   - src/core/ext/filters/channel_idle/channel_idle_filter.cc
   - src/core/ext/filters/channel_idle/idle_filter_state.cc
+  - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   - src/core/ext/filters/client_channel/backend_metric.cc
   - src/core/ext/filters/client_channel/backup_poller.cc
   - src/core/ext/filters/client_channel/channel_connectivity.cc

config.m4

@@ -45,6 +45,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/filters/census/grpc_context.cc \
     src/core/ext/filters/channel_idle/channel_idle_filter.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
+    src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
     src/core/ext/filters/client_channel/backend_metric.cc \
     src/core/ext/filters/client_channel/backup_poller.cc \
     src/core/ext/filters/client_channel/channel_connectivity.cc \

config.w32

@@ -10,6 +10,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\filters\\census\\grpc_context.cc " +
     "src\\core\\ext\\filters\\channel_idle\\channel_idle_filter.cc " +
     "src\\core\\ext\\filters\\channel_idle\\idle_filter_state.cc " +
+    "src\\core\\ext\\filters\\channel_idle\\legacy_channel_idle_filter.cc " +
     "src\\core\\ext\\filters\\client_channel\\backend_metric.cc " +
     "src\\core\\ext\\filters\\client_channel\\backup_poller.cc " +
     "src\\core\\ext\\filters\\client_channel\\channel_connectivity.cc " +

gRPC-C++.podspec

@@ -251,6 +251,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                       'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                       'src/core/ext/filters/channel_idle/idle_filter_state.h',
+                      'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                       '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',
@@ -1503,6 +1504,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                               'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                               'src/core/ext/filters/channel_idle/idle_filter_state.h',
+                              'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                               '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',

gRPC-Core.podspec

@@ -224,6 +224,8 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                       'src/core/ext/filters/channel_idle/idle_filter_state.cc',
                       'src/core/ext/filters/channel_idle/idle_filter_state.h',
+                      'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
+                      'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                       'src/core/ext/filters/client_channel/backend_metric.cc',
                       'src/core/ext/filters/client_channel/backend_metric.h',
                       'src/core/ext/filters/client_channel/backup_poller.cc',
@@ -2286,6 +2288,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                               'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                               'src/core/ext/filters/channel_idle/idle_filter_state.h',
+                              'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                               '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',

grpc.gemspec

@@ -127,6 +127,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/filters/channel_idle/channel_idle_filter.h )
   s.files += %w( src/core/ext/filters/channel_idle/idle_filter_state.cc )
   s.files += %w( src/core/ext/filters/channel_idle/idle_filter_state.h )
+  s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc )
+  s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h )
   s.files += %w( src/core/ext/filters/client_channel/backend_metric.cc )
   s.files += %w( src/core/ext/filters/client_channel/backend_metric.h )
   s.files += %w( src/core/ext/filters/client_channel/backup_poller.cc )

grpc.gyp

@@ -278,6 +278,7 @@
         'src/core/ext/filters/census/grpc_context.cc',
         'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
         'src/core/ext/filters/channel_idle/idle_filter_state.cc',
+        'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
         'src/core/ext/filters/client_channel/backend_metric.cc',
         'src/core/ext/filters/client_channel/backup_poller.cc',
         'src/core/ext/filters/client_channel/channel_connectivity.cc',
@@ -1134,6 +1135,7 @@
         'src/core/ext/filters/census/grpc_context.cc',
         'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
         'src/core/ext/filters/channel_idle/idle_filter_state.cc',
+        'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
         'src/core/ext/filters/client_channel/backend_metric.cc',
         'src/core/ext/filters/client_channel/backup_poller.cc',
         'src/core/ext/filters/client_channel/channel_connectivity.cc',

package.xml

@@ -109,6 +109,8 @@
     <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/channel_idle_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/idle_filter_state.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/idle_filter_state.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backend_metric.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backend_metric.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.cc" role="src" />

src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h

@@ -140,4 +140,4 @@ class LegacyMaxAgeFilter final : public LegacyChannelIdleFilter {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_CHANNEL_IDLE_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H

src/python/grpcio/grpc_core_dependencies.py

@@ -19,6 +19,7 @@ CORE_SOURCE_FILES = [
     'src/core/ext/filters/census/grpc_context.cc',
     'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
     'src/core/ext/filters/channel_idle/idle_filter_state.cc',
+    'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
     'src/core/ext/filters/client_channel/backend_metric.cc',
     'src/core/ext/filters/client_channel/backup_poller.cc',
     'src/core/ext/filters/client_channel/channel_connectivity.cc',

tools/doxygen/Doxyfile.c++.internal

@@ -1087,6 +1087,8 @@ src/core/ext/filters/channel_idle/channel_idle_filter.cc \
 src/core/ext/filters/channel_idle/channel_idle_filter.h \
 src/core/ext/filters/channel_idle/idle_filter_state.cc \
 src/core/ext/filters/channel_idle/idle_filter_state.h \
+src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
+src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h \
 src/core/ext/filters/client_channel/backend_metric.cc \
 src/core/ext/filters/client_channel/backend_metric.h \
 src/core/ext/filters/client_channel/backup_poller.cc \

tools/doxygen/Doxyfile.core.internal

@@ -891,6 +891,8 @@ src/core/ext/filters/channel_idle/channel_idle_filter.cc \
 src/core/ext/filters/channel_idle/channel_idle_filter.h \
 src/core/ext/filters/channel_idle/idle_filter_state.cc \
 src/core/ext/filters/channel_idle/idle_filter_state.h \
+src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
+src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h \
 src/core/ext/filters/client_channel/README.md \
 src/core/ext/filters/client_channel/backend_metric.cc \
 src/core/ext/filters/client_channel/backend_metric.h \