diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-04-06 17:11:44 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-04-06 17:11:44 +0200 |
| commit | 61f729fe1a4a0c1b04f645a37f11242130bbe767 (patch) | |
| tree | 42d92aa9f75c7fd66fc87021639c3be236f727ab /src/python | |
| parent | 5beff342346e4c358e5ccf39d3809b99bd60672c (diff) | |
| parent | e7369020a9b6fd0a70d09761c16d95201e04c558 (diff) | |
Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc/_server.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py index 47838c2c98..f29c44a4cf 100644 --- a/src/python/grpcio/grpc/_server.py +++ b/src/python/grpcio/grpc/_server.py @@ -705,6 +705,10 @@ def _serve(state): state.rpc_states.remove(rpc_state) if _stop_serving(state): return + # We want to force the deletion of the previous event + # ~before~ we poll again; if the event has a reference + # to a shutdown Call object, this can induce spinlock. + event = None def _stop(state, grace): |