diff options
| author |  Masood Malekghassemi <soltanmm@users.noreply.github.com> | 2015-08-31 12:08:15 -0400 |
|---|---|---|
| committer | Masood Malekghassemi <soltanmm@users.noreply.github.com> | 2015-08-31 12:08:15 -0400 |
| commit | 696e5a309d7ededbdb3679f665ddf133c929995b (patch) | |
| tree | f5ec188b9bdffa8ac2abf4c09786b5e0b2f10ccf /src/python | |
| parent | 6de001e3f4e834be26850bf0fa22b0fc96df3c54 (diff) | |
| parent | 1d14618a0e3a86a705d543a8c761aa60bd1a59c0 (diff) | |
Merge pull request #3146 from nathanielmanistaatgoogle/grace
Fix grace period bug in _end.accept_ticket
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc/framework/core/_end.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/python/grpcio/grpc/framework/core/_end.py b/src/python/grpcio/grpc/framework/core/_end.py index 5ef2f6d3a3..f57cde4e58 100644 --- a/src/python/grpcio/grpc/framework/core/_end.py +++ b/src/python/grpcio/grpc/framework/core/_end.py @@ -203,11 +203,11 @@ class _End(End): def accept_ticket(self, ticket): """See links.Link.accept_ticket for specification.""" with self._lock: - if self._cycle is not None and not self._cycle.grace: + if self._cycle is not None: operation = self._cycle.operations.get(ticket.operation_id) if operation is not None: operation.handle_ticket(ticket) - elif self._servicer_package is not None: + elif self._servicer_package is not None and not self._cycle.grace: termination_action = _termination_action( self._lock, self._stats, ticket.operation_id, self._cycle) operation = _operation.service_operate( |