From 5eefacdf2c2e08c765dd8556b5780c77f31e8d62 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 19 Nov 2019 14:39:31 +0000 Subject: [PATCH] back to gs multiple Fixes https://github.com/iterative/dvc/pull/2809#discussion_r347954033 --- dvc/remote/gs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py index b27a83740..45dc6b7bd 100644 --- a/dvc/remote/gs.py +++ b/dvc/remote/gs.py @@ -17,13 +17,13 @@ from dvc.scheme import Schemes from dvc.utils.compat import FileNotFoundError # skipcq: PYL-W0622 logger = logging.getLogger(__name__) -MIN_CHUNKSIZE = 256 * 1024 def dynamic_chunk_size(func): @wraps(func) def wrapper(*args, **kwargs): import requests + from google.cloud.storage.blob import Blob # `ConnectionError` may be due to too large `chunk_size` # (see [#2572]) so try halving on error. @@ -37,7 +37,7 @@ def dynamic_chunk_size(func): while True: try: # skipcq: PYL-W0212 - chunk_size = MIN_CHUNKSIZE * multiplier + chunk_size = Blob._CHUNK_SIZE_MULTIPLE * multiplier return func(*args, chunk_size=chunk_size, **kwargs) except requests.exceptions.ConnectionError: multiplier //= 2