Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
19617bb7
Commit
19617bb7
authored
7 years ago
by
David G. Quintas
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #11874 from dgquintas/fix_pending_grpclb
Free pending grpclb update args
parents
d069872b
ae5e83b6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
+3
-2
3 additions, 2 deletions
...core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
with
3 additions
and
2 deletions
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
+
3
−
2
View file @
19617bb7
...
@@ -1705,7 +1705,6 @@ static void lb_on_server_status_received_locked(grpc_exec_ctx *exec_ctx,
...
@@ -1705,7 +1705,6 @@ static void lb_on_server_status_received_locked(grpc_exec_ctx *exec_ctx,
static
void
glb_update_locked
(
grpc_exec_ctx
*
exec_ctx
,
grpc_lb_policy
*
policy
,
static
void
glb_update_locked
(
grpc_exec_ctx
*
exec_ctx
,
grpc_lb_policy
*
policy
,
const
grpc_lb_policy_args
*
args
)
{
const
grpc_lb_policy_args
*
args
)
{
glb_lb_policy
*
glb_policy
=
(
glb_lb_policy
*
)
policy
;
glb_lb_policy
*
glb_policy
=
(
glb_lb_policy
*
)
policy
;
if
(
glb_policy
->
updating_lb_channel
)
{
if
(
glb_policy
->
updating_lb_channel
)
{
if
(
GRPC_TRACER_ON
(
grpc_lb_glb_trace
))
{
if
(
GRPC_TRACER_ON
(
grpc_lb_glb_trace
))
{
gpr_log
(
GPR_INFO
,
gpr_log
(
GPR_INFO
,
...
@@ -1813,9 +1812,11 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx,
...
@@ -1813,9 +1812,11 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx,
// lb_on_server_status_received will pick up the cancel and reinit
// lb_on_server_status_received will pick up the cancel and reinit
// lb_call.
// lb_call.
if
(
glb_policy
->
pending_update_args
!=
NULL
)
{
if
(
glb_policy
->
pending_update_args
!=
NULL
)
{
const
grpc_lb_policy_args
*
args
=
glb_policy
->
pending_update_args
;
grpc_lb_policy_args
*
args
=
glb_policy
->
pending_update_args
;
glb_policy
->
pending_update_args
=
NULL
;
glb_policy
->
pending_update_args
=
NULL
;
glb_update_locked
(
exec_ctx
,
&
glb_policy
->
base
,
args
);
glb_update_locked
(
exec_ctx
,
&
glb_policy
->
base
,
args
);
grpc_channel_args_destroy
(
exec_ctx
,
args
->
args
);
gpr_free
(
args
);
}
}
}
else
if
(
glb_policy
->
started_picking
&&
!
glb_policy
->
shutting_down
)
{
}
else
if
(
glb_policy
->
started_picking
&&
!
glb_policy
->
shutting_down
)
{
if
(
glb_policy
->
retry_timer_active
)
{
if
(
glb_policy
->
retry_timer_active
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment