Commita5604a5

authored

fix: resolve the issue where rpc timeout of 0 is used when timeout expires (#776)

* fix: resolve the issue where rpc timeout of 0 is used when timeout expires* address offline feedback* formatting* update comment

1 parentb1fae31 commita5604a5Copy full SHA for a5604a5

File tree

+16

-6

lines changed

+16

-6

lines changed

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ def __call__(self, func):`
`102`	`102`	`deffunc_with_timeout(args,*kwargs):`
`103`	`103`	`"""Wrapped function that adds timeout."""`
`104`	`104`
`105`		`-remaining_timeout=self._timeout`
`106`		`-ifremaining_timeoutisnotNone:`
	`105`	`+ifself._timeoutisnotNone:`
`107`	`106`	`# All calculations are in seconds`
`108`	`107`	`now_timestamp=self._clock().timestamp()`
`109`	`108`
`@@ -114,8 +113,19 @@ def func_with_timeout(args, *kwargs):`
`114`	`113`	`now_timestamp=first_attempt_timestamp`
`115`	`114`
`116`	`115`	`time_since_first_attempt=now_timestamp-first_attempt_timestamp`
`117`		`-# Avoid setting negative timeout`
`118`		`-kwargs["timeout"]=max(0,self._timeout-time_since_first_attempt)`
	`116`	`+remaining_timeout=self._timeout-time_since_first_attempt`
	`117`	`+`
	`118`	+# Although the `deadline` parameter in `google.api_core.retry.Retry`
	`119`	+# is deprecated, and should be treated the same as the `timeout`,
	`120`	+# it is still possible for the `deadline` argument in
	`121`	+# `google.api_core.retry.Retry` to be larger than the `timeout`.
	`122`	`+# See https://github.com/googleapis/python-api-core/issues/654`
	`123`	`+# Only positive non-zero timeouts are supported.`
	`124`	`+# Revert back to the initial timeout for negative or 0 timeout values.`
	`125`	`+ifremaining_timeout<1:`
	`126`	`+remaining_timeout=self._timeout`
	`127`	`+`
	`128`	`+kwargs["timeout"]=remaining_timeout`
`119`	`129`
`120`	`130`	`returnfunc(args,*kwargs)`
`121`	`131`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ def _clock():`
`84`	`84`	`wrapped()`
`85`	`85`	`target.assert_called_with(timeout=3.0)`
`86`	`86`	`wrapped()`
`87`		`-target.assert_called_with(timeout=0.0)`
	`87`	`+target.assert_called_with(timeout=42.0)`
`88`	`88`	`wrapped()`
`89`		`-target.assert_called_with(timeout=0.0)`
	`89`	`+target.assert_called_with(timeout=42.0)`
`90`	`90`
`91`	`91`	`deftest_apply_no_timeout(self):`
`92`	`92`	`target=mock.Mock(spec=["__call__","__name__"],__name__="target")`

Comments

(0)