aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-04-07 06:46:08 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-04-07 06:46:08 -0700
commit5f399d173bd73b4d48442e2241859c4a5fb854f1 (patch)
tree272adf760f8bf0e37347e131075a51b610746785 /src/python
parent7b6c7a3927f75704cb3f7f02024f284b6817405a (diff)
parentb567bb43670f7f2523164fdabdea8786a7595854 (diff)
Merge github.com:grpc/grpc into minimal_test
Diffstat (limited to 'src/python')
-rw-r--r--src/python/grpcio/grpc/_server.py4
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):