Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdrive: remove redundant _gdrive_retry function #6831

Merged
merged 2 commits into from
Oct 18, 2021
Merged

gdrive: remove redundant _gdrive_retry function #6831

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edcec97
gdrive: remove redundant _gdrive_retry function
isidentical Oct 18, 2021
a429e73
gdrive: remove unused retry
efiop Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions dvc/fs/gdrive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import threading
from urllib.parse import urlparse

from funcy import cached_property, retry, wrap_prop
from funcy import cached_property, wrap_prop

from dvc.exceptions import DvcException
from dvc.path_info import CloudURLInfo
Expand Down Expand Up @@ -34,36 +34,6 @@ def __init__(self, cred_location):
super().__init__(message)


def _gdrive_retry(func):
def should_retry(exc):
from pydrive2.files import ApiRequestError

if not isinstance(exc, ApiRequestError):
return False

error_code = exc.error.get("code", 0)
result = False
if 500 <= error_code < 600:
result = True

if error_code == 403:
result = exc.GetField("reason") in [
"userRateLimitExceeded",
"rateLimitExceeded",
]
if result:
logger.debug(f"Retrying GDrive API call, error: {exc}.")

return result

# 16 tries, start at 0.5s, multiply by golden ratio, cap at 20s
return retry(
16,
timeout=lambda a: min(0.5 * 1.618 ** a, 20),
filter_errors=should_retry,
)(func)


class GDriveURLInfo(CloudURLInfo):
def __init__(self, url):
super().__init__(url)
Expand Down