diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-09-30 11:20:15 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-30 11:20:15 -0700 |
| commit | 673fa6c88b8abd542ae50c4480de92880a1e4777 (patch) | |
| tree | c52748169c821f9b121793ad69a0ebf665e855af /src/core | |
| parent | d76e1594a50cc5505db6d1e955b1ab6a806b1024 (diff) | |
| parent | fc80671df6f2320bc7a0c55e56c3afe92454e609 (diff) | |
Merge pull request #8227 from dgquintas/grpclb_service_name
Use the server's name as the service name for gRPC LB
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index 0050489425..bdfe65a62a 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -923,6 +923,9 @@ static void srv_status_rcvd_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error); static lb_client_data *lb_client_data_create(glb_lb_policy *glb_policy) { + GPR_ASSERT(glb_policy->server_name != NULL); + GPR_ASSERT(glb_policy->server_name[0] != '\0'); + lb_client_data *lb_client = gpr_malloc(sizeof(lb_client_data)); memset(lb_client, 0, sizeof(lb_client_data)); @@ -943,14 +946,14 @@ static lb_client_data *lb_client_data_create(glb_lb_policy *glb_policy) { lb_client->lb_call = grpc_channel_create_pollset_set_call( glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, - "/grpc.lb.v1.LoadBalancer/BalanceLoad", NULL, lb_client->deadline, NULL); + "/grpc.lb.v1.LoadBalancer/BalanceLoad", glb_policy->server_name, + lb_client->deadline, NULL); grpc_metadata_array_init(&lb_client->initial_metadata_recv); grpc_metadata_array_init(&lb_client->trailing_metadata_recv); - grpc_grpclb_request *request = grpc_grpclb_request_create( - "load.balanced.service.name"); /* FIXME(dgq): get the name of the load - balanced service from the resolver */ + grpc_grpclb_request *request = + grpc_grpclb_request_create(glb_policy->server_name); gpr_slice request_payload_slice = grpc_grpclb_request_encode(request); lb_client->request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); |