Commitaefd44b

committed

Updated the retryable condition

1 parentfba9759 commitaefd44bCopy full SHA for aefd44b

File tree

-28

lines changed

-28

lines changed

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -241,14 +241,6 @@ def command_type(self) -> Optional[CommandType]:`
`241`	`241`	`defcommand_type(self,value:CommandType)->None:`
`242`	`242`	`self._command_type=value`
`243`	`243`
`244`		`-@property`
`245`		`-defis_retryable(self)->bool:`
`246`		`-returnself._is_retryable`
`247`		`-`
`248`		`-@is_retryable.setter`
`249`		`-defis_retryable(self,value:bool)->None:`
`250`		`-self._is_retryable=value`
`251`		`-`
`252`	`244`	`@property`
`253`	`245`	`defdelay_default(self)->float:`
`254`	`246`	`"""Time in seconds the connector will wait between requests polling a GetOperationStatus Request`
`@@ -369,9 +361,6 @@ def should_retry(self, method: str, status_code: int) -> Tuple[bool, str]:`
`369`	`361`	`ifstatus_code==501:`
`370`	`362`	`raiseNonRecoverableNetworkError("Received code 501 from server.")`
`371`	`363`
`372`		`-ifself.is_retryable==False:`
`373`		`-returnFalse,"Request is not retryable"`
`374`		`-`
`375`	`364`	`# Request failed and this method is not retryable. We only retry POST requests.`
`376`	`365`	`ifnotself._is_method_retryable(method):`
`377`	`366`	`returnFalse,"Only POST requests are retried"`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,12 +216,3 @@ def set_retry_command_type(self, value: CommandType):`
`216`	`216`	`logger.warning(`
`217`	`217`	`"DatabricksRetryPolicy is currently bypassed. The CommandType cannot be set."`
`218`	`218`	`)`
`219`		`-`
`220`		`-defset_is_retryable(self,retryable:bool):`
`221`		`-"""Pass the provided retryable flag to the retry policy"""`
`222`		`-ifisinstance(self.retry_policy,DatabricksRetryPolicy):`
`223`		`-self.retry_policy.is_retryable=retryable`
`224`		`-else:`
`225`		`-logger.warning(`
`226`		`-"DatabricksRetryPolicy is currently bypassed. The is_retryable flag cannot be set."`
`227`		`- )`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,6 @@ def attempt_request(attempt):`
`376`	`376`	`ifself.enable_v3_retries:`
`377`	`377`	`this_command_type=CommandType.get(this_method_name)`
`378`	`378`	`self._transport.set_retry_command_type(this_command_type)`
`379`		`-self._transport.set_is_retryable(retryable)`
`380`	`379`	`self._transport.startRetryTimer()`
`381`	`380`
`382`	`381`	`response=method(request)`
`@@ -461,7 +460,7 @@ def attempt_request(attempt):`
`461`	`460`	`# return on success`
`462`	`461`	`# if available: bounded delay and retry`
`463`	`462`	`# if not: raise error`
`464`		`-max_attempts=self._retry_stop_after_attempts_count`
	`463`	`+max_attempts=self._retry_stop_after_attempts_countifretryableelse1`
`465`	`464`
`466`	`465`	`# use index-1 counting for logging/human consistency`
`467`	`466`	`forattemptinrange(1,max_attempts+1):`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,3 @@ def test_sleep__retry_after_present(self, t_mock, retry_policy, error_history):`
`84`	`84`	`retry_policy.history= [error_history,error_history,error_history]`
`85`	`85`	`retry_policy.sleep(HTTPResponse(status=503,headers={"Retry-After":"3"}))`
`86`	`86`	`t_mock.assert_called_with(3)`
`87`		`-`
`88`		`-deftest_not_retryable__fetch_results_orientation_fetch_next(self,retry_policy):`
`89`		`-HTTP_STATUS_CODES= [200,429,503,504]`
`90`		`-retry_policy.is_retryable=False`
`91`		`-forstatus_codeinHTTP_STATUS_CODES:`
`92`		`-assertnotretry_policy.is_retry("METHOD_NAME",status_code=status_code)`

Comments

(0)