diff options
| author |  kpayson64 <kpayson@google.com> | 2017-12-14 13:11:35 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-14 13:11:35 -0800 |
| commit | f5649c7e9634bfa4f1522c0ebef4947004ef1a64 (patch) | |
| tree | 2cb58bbdce04dd56e761c6c76d7ae2d18aa3772d /src | |
| parent | bbb6270dc747c2488495be949d1c5f54dcb41e5c (diff) | |
| parent | 8179b9523a5f56c1cea63ca5060ccebf6f30c7b6 (diff) | |
Merge pull request #13786 from kpayson64/fix_python_server_race
Fixes race condition in Python server shutdown
Diffstat (limited to 'src')
| -rw-r--r-- | src/python/grpcio/grpc/_server.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py index 8857bd3eb5..02d3af8706 100644 --- a/src/python/grpcio/grpc/_server.py +++ b/src/python/grpcio/grpc/_server.py @@ -634,7 +634,7 @@ class _ServerState(object): # pylint: disable=too-many-arguments def __init__(self, completion_queue, server, generic_handlers, interceptor_pipeline, thread_pool, maximum_concurrent_rpcs): - self.lock = threading.Lock() + self.lock = threading.RLock() self.completion_queue = completion_queue self.server = server self.generic_handlers = list(generic_handlers) @@ -747,22 +747,12 @@ def _stop(state, grace): state.shutdown_events.append(shutdown_event) if grace is None: state.server.cancel_all_calls() - # TODO(https://github.com/grpc/grpc/issues/6597): delete this loop. - for rpc_state in state.rpc_states: - with rpc_state.condition: - rpc_state.client = _CANCELLED - rpc_state.condition.notify_all() else: def cancel_all_calls_after_grace(): shutdown_event.wait(timeout=grace) with state.lock: state.server.cancel_all_calls() - # TODO(https://github.com/grpc/grpc/issues/6597): delete this loop. - for rpc_state in state.rpc_states: - with rpc_state.condition: - rpc_state.client = _CANCELLED - rpc_state.condition.notify_all() thread = threading.Thread(target=cancel_all_calls_after_grace) thread.start() |