Commitb2202c7

committed

Updated the non retying to only inline case

1 parentbf26881 commitb2202c7Copy full SHA for b2202c7

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class CommandType(Enum):`
`32`	`32`	`CLOSE_SESSION="CloseSession"`
`33`	`33`	`CLOSE_OPERATION="CloseOperation"`
`34`	`34`	`GET_OPERATION_STATUS="GetOperationStatus"`
`35`		`-FETCH_RESULTS_ORIENTATION_FETCH_NEXT="FetchResultsOrientation_FETCH_NEXT"`
	`35`	`+FETCH_RESULTS_INLINE_FETCH_NEXT="FetchResultsInline_FETCH_NEXT"`
`36`	`36`	`OTHER="Other"`
`37`	`37`
`38`	`38`	`@classmethod`
`@@ -363,10 +363,10 @@ def should_retry(self, method: str, status_code: int) -> Tuple[bool, str]:`
`363`	`363`	`ifstatus_code==501:`
`364`	`364`	`raiseNonRecoverableNetworkError("Received code 501 from server.")`
`365`	`365`
`366`		`-ifself.command_type==CommandType.FETCH_RESULTS_ORIENTATION_FETCH_NEXT:`
	`366`	`+ifself.command_type==CommandType.FETCH_RESULTS_INLINE_FETCH_NEXT:`
`367`	`367`	`return (`
`368`	`368`	`False,`
`369`		`-"FetchResults with FETCH_NEXT orientation are not idempotent in inline mode and is not retried",`
	`369`	`+"FetchResultsin INLINE modewith FETCH_NEXT orientation are not idempotent and is not retried",`
`370`	`370`	`)`
`371`	`371`
`372`	`372`	`# Request failed and this method is not retryable. We only retry POST requests.`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,8 @@ def __init__(`
`156`	`156`	`)`
`157`	`157`
`158`	`158`	`# Cloud fetch`
	`159`	`+self._use_cloud_fetch=kwargs.get("use_cloud_fetch",True)`
	`160`	`+`
`159`	`161`	`self.max_download_threads=kwargs.get("max_download_threads",10)`
`160`	`162`
`161`	`163`	`self._ssl_options=ssl_options`
`@@ -374,10 +376,13 @@ def attempt_request(attempt):`
`374`	`376`
`375`	`377`	`# These three lines are no-ops if the v3 retry policy is not in use`
`376`	`378`	`ifself.enable_v3_retries:`
`377`		`-# Not to retry when FetchResults has orientation as FETCH_NEXT as it is not idempotent`
`378`		`-ifthis_method_name=="FetchResults":`
	`379`	`+# Not to retry when FetchResults in INLINE mode when it has orientation as FETCH_NEXT as it is not idempotent`
	`380`	`+if (`
	`381`	`+this_method_name=="FetchResults"`
	`382`	`+andself._use_cloud_fetch==False`
	`383`	`+ ):`
`379`	`384`	`this_method_name+= (`
`380`		`-"Orientation_"`
	`385`	`+"Inline_"`
`381`	`386`	`+ttypes.TFetchOrientation._VALUES_TO_NAMES[`
`382`	`387`	`request.orientation`
`383`	`388`	`]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,6 @@ def test_sleep__retry_after_present(self, t_mock, retry_policy, error_history):`
`87`	`87`
`88`	`88`	`deftest_not_retryable__fetch_results_orientation_fetch_next(self,retry_policy):`
`89`	`89`	`HTTP_STATUS_CODES= [200,429,503,504]`
`90`		`-retry_policy.command_type=CommandType.FETCH_RESULTS_ORIENTATION_FETCH_NEXT`
	`90`	`+retry_policy.command_type=CommandType.FETCH_RESULTS_INLINE_FETCH_NEXT`
`91`	`91`	`forstatus_codeinHTTP_STATUS_CODES:`
`92`	`92`	`assertnotretry_policy.is_retry("METHOD_NAME",status_code=status_code)`

Comments

(0)