Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgq…

…uintas/grpc into ccmerge

BUILD

@@ -166,6 +166,7 @@ cc_library(
  "src/core/ext/census/mlog.h",
  "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/client_config/client_channel.h",
+ "src/core/ext/client_config/client_channel_factory.h",
  "src/core/ext/client_config/client_config.h",
  "src/core/ext/client_config/connector.h",
  "src/core/ext/client_config/initial_connect_string.h",
@@ -176,7 +177,6 @@ cc_library(
  "src/core/ext/client_config/resolver_factory.h",
  "src/core/ext/client_config/resolver_registry.h",
  "src/core/ext/client_config/subchannel.h",
- "src/core/ext/client_config/subchannel_factory.h",
  "src/core/ext/client_config/subchannel_index.h",
  "src/core/ext/client_config/uri_parser.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@@ -301,6 +301,7 @@ cc_library(
  "src/core/ext/census/tracing.c",
  "src/core/ext/client_config/channel_connectivity.c",
  "src/core/ext/client_config/client_channel.c",
+ "src/core/ext/client_config/client_channel_factory.c",
  "src/core/ext/client_config/client_config.c",
  "src/core/ext/client_config/connector.c",
  "src/core/ext/client_config/default_initial_connect_string.c",
@@ -312,7 +313,6 @@ cc_library(
  "src/core/ext/client_config/resolver_factory.c",
  "src/core/ext/client_config/resolver_registry.c",
  "src/core/ext/client_config/subchannel.c",
- "src/core/ext/client_config/subchannel_factory.c",
  "src/core/ext/client_config/subchannel_index.c",
  "src/core/ext/client_config/uri_parser.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
@@ -529,6 +529,7 @@ cc_library(
  "src/core/ext/census/mlog.h",
  "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/client_config/client_channel.h",
+ "src/core/ext/client_config/client_channel_factory.h",
  "src/core/ext/client_config/client_config.h",
  "src/core/ext/client_config/connector.h",
  "src/core/ext/client_config/initial_connect_string.h",
@@ -539,7 +540,6 @@ cc_library(
  "src/core/ext/client_config/resolver_factory.h",
  "src/core/ext/client_config/resolver_registry.h",
  "src/core/ext/client_config/subchannel.h",
- "src/core/ext/client_config/subchannel_factory.h",
  "src/core/ext/client_config/subchannel_index.h",
  "src/core/ext/client_config/uri_parser.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@@ -650,6 +650,7 @@ cc_library(
  "src/core/ext/census/tracing.c",
  "src/core/ext/client_config/channel_connectivity.c",
  "src/core/ext/client_config/client_channel.c",
+ "src/core/ext/client_config/client_channel_factory.c",
  "src/core/ext/client_config/client_config.c",
  "src/core/ext/client_config/connector.c",
  "src/core/ext/client_config/default_initial_connect_string.c",
@@ -661,7 +662,6 @@ cc_library(
  "src/core/ext/client_config/resolver_factory.c",
  "src/core/ext/client_config/resolver_registry.c",
  "src/core/ext/client_config/subchannel.c",
- "src/core/ext/client_config/subchannel_factory.c",
  "src/core/ext/client_config/subchannel_index.c",
  "src/core/ext/client_config/uri_parser.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
@@ -1355,6 +1355,7 @@ objc_library(
  "src/core/ext/census/tracing.c",
  "src/core/ext/client_config/channel_connectivity.c",
  "src/core/ext/client_config/client_channel.c",
+ "src/core/ext/client_config/client_channel_factory.c",
  "src/core/ext/client_config/client_config.c",
  "src/core/ext/client_config/connector.c",
  "src/core/ext/client_config/default_initial_connect_string.c",
@@ -1366,7 +1367,6 @@ objc_library(
  "src/core/ext/client_config/resolver_factory.c",
  "src/core/ext/client_config/resolver_registry.c",
  "src/core/ext/client_config/subchannel.c",
- "src/core/ext/client_config/subchannel_factory.c",
  "src/core/ext/client_config/subchannel_index.c",
  "src/core/ext/client_config/uri_parser.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
@@ -1525,6 +1525,7 @@ objc_library(
  "src/core/ext/census/mlog.h",
  "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/client_config/client_channel.h",
+ "src/core/ext/client_config/client_channel_factory.h",
  "src/core/ext/client_config/client_config.h",
  "src/core/ext/client_config/connector.h",
  "src/core/ext/client_config/initial_connect_string.h",
@@ -1535,7 +1536,6 @@ objc_library(
  "src/core/ext/client_config/resolver_factory.h",
  "src/core/ext/client_config/resolver_registry.h",
  "src/core/ext/client_config/subchannel.h",
- "src/core/ext/client_config/subchannel_factory.h",
  "src/core/ext/client_config/subchannel_index.h",
  "src/core/ext/client_config/uri_parser.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",

Makefile

@@ -2449,6 +2449,7 @@ LIBGRPC_SRC = \
  src/core/ext/census/tracing.c \
  src/core/ext/client_config/channel_connectivity.c \
  src/core/ext/client_config/client_channel.c \
+ src/core/ext/client_config/client_channel_factory.c \
  src/core/ext/client_config/client_config.c \
  src/core/ext/client_config/connector.c \
  src/core/ext/client_config/default_initial_connect_string.c \
@@ -2460,7 +2461,6 @@ LIBGRPC_SRC = \
  src/core/ext/client_config/resolver_factory.c \
  src/core/ext/client_config/resolver_registry.c \
  src/core/ext/client_config/subchannel.c \
- src/core/ext/client_config/subchannel_factory.c \
  src/core/ext/client_config/subchannel_index.c \
  src/core/ext/client_config/uri_parser.c \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \
@@ -2808,6 +2808,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/ext/census/tracing.c \
  src/core/ext/client_config/channel_connectivity.c \
  src/core/ext/client_config/client_channel.c \
+ src/core/ext/client_config/client_channel_factory.c \
  src/core/ext/client_config/client_config.c \
  src/core/ext/client_config/connector.c \
  src/core/ext/client_config/default_initial_connect_string.c \
@@ -2819,7 +2820,6 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/ext/client_config/resolver_factory.c \
  src/core/ext/client_config/resolver_registry.c \
  src/core/ext/client_config/subchannel.c \
- src/core/ext/client_config/subchannel_factory.c \
  src/core/ext/client_config/subchannel_index.c \
  src/core/ext/client_config/uri_parser.c \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \

binding.gyp

@@ -569,6 +569,7 @@
  'src/core/ext/census/tracing.c',
  'src/core/ext/client_config/channel_connectivity.c',
  'src/core/ext/client_config/client_channel.c',
+ 'src/core/ext/client_config/client_channel_factory.c',
  'src/core/ext/client_config/client_config.c',
  'src/core/ext/client_config/connector.c',
  'src/core/ext/client_config/default_initial_connect_string.c',
@@ -580,7 +581,6 @@
  'src/core/ext/client_config/resolver_factory.c',
  'src/core/ext/client_config/resolver_registry.c',
  'src/core/ext/client_config/subchannel.c',
- 'src/core/ext/client_config/subchannel_factory.c',
  'src/core/ext/client_config/subchannel_index.c',
  'src/core/ext/client_config/uri_parser.c',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',

build.yaml

@@ -415,6 +415,7 @@ filegroups:
 - name: grpc_client_config
  headers:
  - src/core/ext/client_config/client_channel.h
+ - src/core/ext/client_config/client_channel_factory.h
  - src/core/ext/client_config/client_config.h
  - src/core/ext/client_config/connector.h
  - src/core/ext/client_config/initial_connect_string.h
@@ -425,12 +426,12 @@ filegroups:
  - src/core/ext/client_config/resolver_factory.h
  - src/core/ext/client_config/resolver_registry.h
  - src/core/ext/client_config/subchannel.h
- - src/core/ext/client_config/subchannel_factory.h
  - src/core/ext/client_config/subchannel_index.h
  - src/core/ext/client_config/uri_parser.h
  src:
  - src/core/ext/client_config/channel_connectivity.c
  - src/core/ext/client_config/client_channel.c
+ - src/core/ext/client_config/client_channel_factory.c
  - src/core/ext/client_config/client_config.c
  - src/core/ext/client_config/connector.c
  - src/core/ext/client_config/default_initial_connect_string.c
@@ -442,7 +443,6 @@ filegroups:
  - src/core/ext/client_config/resolver_factory.c
  - src/core/ext/client_config/resolver_registry.c
  - src/core/ext/client_config/subchannel.c
- - src/core/ext/client_config/subchannel_factory.c
  - src/core/ext/client_config/subchannel_index.c
  - src/core/ext/client_config/uri_parser.c
 - name: grpc_codegen

config.m4

@@ -91,6 +91,7 @@ if test "$PHP_GRPC" != "no"; then
  src/core/ext/census/tracing.c \
  src/core/ext/client_config/channel_connectivity.c \
  src/core/ext/client_config/client_channel.c \
+ src/core/ext/client_config/client_channel_factory.c \
  src/core/ext/client_config/client_config.c \
  src/core/ext/client_config/connector.c \
  src/core/ext/client_config/default_initial_connect_string.c \
@@ -102,7 +103,6 @@ if test "$PHP_GRPC" != "no"; then
  src/core/ext/client_config/resolver_factory.c \
  src/core/ext/client_config/resolver_registry.c \
  src/core/ext/client_config/subchannel.c \
- src/core/ext/client_config/subchannel_factory.c \
  src/core/ext/client_config/subchannel_index.c \
  src/core/ext/client_config/uri_parser.c \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \

gRPC.podspec

@@ -168,6 +168,7 @@ Pod::Spec.new do |s|
  'src/core/ext/census/mlog.h',
  'src/core/ext/census/rpc_metric_id.h',
  'src/core/ext/client_config/client_channel.h',
+ 'src/core/ext/client_config/client_channel_factory.h',
  'src/core/ext/client_config/client_config.h',
  'src/core/ext/client_config/connector.h',
  'src/core/ext/client_config/initial_connect_string.h',
@@ -178,7 +179,6 @@ Pod::Spec.new do |s|
  'src/core/ext/client_config/resolver_factory.h',
  'src/core/ext/client_config/resolver_registry.h',
  'src/core/ext/client_config/subchannel.h',
- 'src/core/ext/client_config/subchannel_factory.h',
  'src/core/ext/client_config/subchannel_index.h',
  'src/core/ext/client_config/uri_parser.h',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
@@ -320,6 +320,7 @@ Pod::Spec.new do |s|
  'src/core/ext/census/tracing.c',
  'src/core/ext/client_config/channel_connectivity.c',
  'src/core/ext/client_config/client_channel.c',
+ 'src/core/ext/client_config/client_channel_factory.c',
  'src/core/ext/client_config/client_config.c',
  'src/core/ext/client_config/connector.c',
  'src/core/ext/client_config/default_initial_connect_string.c',
@@ -331,7 +332,6 @@ Pod::Spec.new do |s|
  'src/core/ext/client_config/resolver_factory.c',
  'src/core/ext/client_config/resolver_registry.c',
  'src/core/ext/client_config/subchannel.c',
- 'src/core/ext/client_config/subchannel_factory.c',
  'src/core/ext/client_config/subchannel_index.c',
  'src/core/ext/client_config/uri_parser.c',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
@@ -491,6 +491,7 @@ Pod::Spec.new do |s|
  'src/core/ext/census/mlog.h',
  'src/core/ext/census/rpc_metric_id.h',
  'src/core/ext/client_config/client_channel.h',
+ 'src/core/ext/client_config/client_channel_factory.h',
  'src/core/ext/client_config/client_config.h',
  'src/core/ext/client_config/connector.h',
  'src/core/ext/client_config/initial_connect_string.h',
@@ -501,7 +502,6 @@ Pod::Spec.new do |s|
  'src/core/ext/client_config/resolver_factory.h',
  'src/core/ext/client_config/resolver_registry.h',
  'src/core/ext/client_config/subchannel.h',
- 'src/core/ext/client_config/subchannel_factory.h',
  'src/core/ext/client_config/subchannel_index.h',
  'src/core/ext/client_config/uri_parser.h',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.h',

grpc.gemspec

@@ -164,6 +164,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/census/mlog.h )
  s.files += %w( src/core/ext/census/rpc_metric_id.h )
  s.files += %w( src/core/ext/client_config/client_channel.h )
+ s.files += %w( src/core/ext/client_config/client_channel_factory.h )
  s.files += %w( src/core/ext/client_config/client_config.h )
  s.files += %w( src/core/ext/client_config/connector.h )
  s.files += %w( src/core/ext/client_config/initial_connect_string.h )
@@ -174,7 +175,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/client_config/resolver_factory.h )
  s.files += %w( src/core/ext/client_config/resolver_registry.h )
  s.files += %w( src/core/ext/client_config/subchannel.h )
- s.files += %w( src/core/ext/client_config/subchannel_factory.h )
  s.files += %w( src/core/ext/client_config/subchannel_index.h )
  s.files += %w( src/core/ext/client_config/uri_parser.h )
  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
@@ -303,6 +303,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/census/tracing.c )
  s.files += %w( src/core/ext/client_config/channel_connectivity.c )
  s.files += %w( src/core/ext/client_config/client_channel.c )
+ s.files += %w( src/core/ext/client_config/client_channel_factory.c )
  s.files += %w( src/core/ext/client_config/client_config.c )
  s.files += %w( src/core/ext/client_config/connector.c )
  s.files += %w( src/core/ext/client_config/default_initial_connect_string.c )
@@ -314,7 +315,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/client_config/resolver_factory.c )
  s.files += %w( src/core/ext/client_config/resolver_registry.c )
  s.files += %w( src/core/ext/client_config/subchannel.c )
- s.files += %w( src/core/ext/client_config/subchannel_factory.c )
  s.files += %w( src/core/ext/client_config/subchannel_index.c )
  s.files += %w( src/core/ext/client_config/uri_parser.c )
  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )

package.json

@@ -107,6 +107,7 @@
  "src/core/ext/census/mlog.h",
  "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/client_config/client_channel.h",
+ "src/core/ext/client_config/client_channel_factory.h",
  "src/core/ext/client_config/client_config.h",
  "src/core/ext/client_config/connector.h",
  "src/core/ext/client_config/initial_connect_string.h",
@@ -117,7 +118,6 @@
  "src/core/ext/client_config/resolver_factory.h",
  "src/core/ext/client_config/resolver_registry.h",
  "src/core/ext/client_config/subchannel.h",
- "src/core/ext/client_config/subchannel_factory.h",
  "src/core/ext/client_config/subchannel_index.h",
  "src/core/ext/client_config/uri_parser.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
@@ -246,6 +246,7 @@
  "src/core/ext/census/tracing.c",
  "src/core/ext/client_config/channel_connectivity.c",
  "src/core/ext/client_config/client_channel.c",
+ "src/core/ext/client_config/client_channel_factory.c",
  "src/core/ext/client_config/client_config.c",
  "src/core/ext/client_config/connector.c",
  "src/core/ext/client_config/default_initial_connect_string.c",
@@ -257,7 +258,6 @@
  "src/core/ext/client_config/resolver_factory.c",
  "src/core/ext/client_config/resolver_registry.c",
  "src/core/ext/client_config/subchannel.c",
- "src/core/ext/client_config/subchannel_factory.c",
  "src/core/ext/client_config/subchannel_index.c",
  "src/core/ext/client_config/uri_parser.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",

package.xml

@@ -168,6 +168,7 @@
  <file baseinstalldir="/" name="src/core/ext/census/mlog.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/census/rpc_metric_id.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.h" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/client_config.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/connector.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.h" role="src" />
@@ -178,7 +179,6 @@
  <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.h" role="src" />
- <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" />
@@ -307,6 +307,7 @@
  <file baseinstalldir="/" name="src/core/ext/census/tracing.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/channel_connectivity.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.c" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/client_config.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/connector.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/default_initial_connect_string.c" role="src" />
@@ -318,7 +319,6 @@
  <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.c" role="src" />
- <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" />

src/core/ext/client_config/README.md

@@ -40,7 +40,7 @@ decisions (for example, by avoiding disconnected backends).
 Configured sub-channels are fully setup to participate in the grpc data plane.
 Their behavior is specified by a set of grpc channel filters defined at their
 construction. To customize this behavior, resolvers build
-grpc_subchannel_factory objects, which use the decorator pattern to customize
+grpc_client_channel_factory objects, which use the decorator pattern to customize
 construction arguments for concrete grpc_subchannel instances.