Commitac8716d

authored

fix(api_core): finalize during close of 'ResumableBidiRpc' (#9337)

Avoid blocking for ill-behaved daemon threads during BiDi shutdown.Closes #8616, #9008.

1 parent8c74e9c commitac8716dCopy full SHA for ac8716d

File tree

+34

-1

lines changed

+34

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,10 @@ def _recv(self):`
`561`	`561`	`defrecv(self):`
`562`	`562`	`returnself._recoverable(self._recv)`
`563`	`563`
	`564`	`+defclose(self):`
	`565`	`+self._finalize(None)`
	`566`	`+super(ResumableBidiRpc,self).close()`
	`567`	`+`
`564`	`568`	`@property`
`565`	`569`	`defis_active(self):`
`566`	`570`	`"""bool: True if this stream is currently open and active."""`
`@@ -698,7 +702,11 @@ def stop(self):`
`698`	`702`	`ifself._threadisnotNone:`
`699`	`703`	`# Resume the thread to wake it up in case it is sleeping.`
`700`	`704`	`self.resume()`
`701`		`-self._thread.join()`
	`705`	`+# The daemonized thread may itself block, so don't wait`
	`706`	`+# for it longer than a second.`
	`707`	`+self._thread.join(1.0)`
	`708`	`+ifself._thread.is_alive():# pragma: NO COVER`
	`709`	`+_LOGGER.warning("Background thread did not exit.")`
`702`	`710`
`703`	`711`	`self._thread=None`
`704`	`712`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -597,6 +597,31 @@ def test_recv_failure(self):`
`597`	`597`	`assertbidi_rpc.is_activeisFalse`
`598`	`598`	`assertcall.cancelledisTrue`
`599`	`599`
	`600`	`+deftest_close(self):`
	`601`	`+call=mock.create_autospec(_CallAndFuture,instance=True)`
	`602`	`+`
	`603`	`+defcancel_side_effect():`
	`604`	`+call.is_active.return_value=False`
	`605`	`+`
	`606`	`+call.cancel.side_effect=cancel_side_effect`
	`607`	`+start_rpc=mock.create_autospec(`
	`608`	`+grpc.StreamStreamMultiCallable,instance=True,return_value=call`
	`609`	`+ )`
	`610`	`+should_recover=mock.Mock(spec=["__call__"],return_value=False)`
	`611`	`+bidi_rpc=bidi.ResumableBidiRpc(start_rpc,should_recover)`
	`612`	`+bidi_rpc.open()`
	`613`	`+`
	`614`	`+bidi_rpc.close()`
	`615`	`+`
	`616`	`+should_recover.assert_not_called()`
	`617`	`+call.cancel.assert_called_once()`
	`618`	`+assertbidi_rpc.call==call`
	`619`	`+assertbidi_rpc.is_activeisFalse`
	`620`	`+# ensure the request queue was signaled to stop.`
	`621`	`+assertbidi_rpc.pending_requests==1`
	`622`	`+assertbidi_rpc._request_queue.get()isNone`
	`623`	`+assertbidi_rpc._finalized`
	`624`	`+`
`600`	`625`	`deftest_reopen_failure_on_rpc_restart(self):`
`601`	`626`	`error1=ValueError("1")`
`602`	`627`	`error2=ValueError("2")`

Comments

(0)