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

(#2195) Added timeout to registry download call #2228

Merged
merged 4 commits into from
Mar 24, 2020
Merged

(#2195) Added timeout to registry download call #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f98b166
(#2195) Added timeout to registry download call
Raalsky Mar 23, 2020
cce99b1
(#2195) Added entry to CHANGELOG
Raalsky Mar 23, 2020
d6cb415
(#2195) DBT_HTTP_TIMEOUT environment variable added
Raalsky Mar 23, 2020
1c60882
(#2195) DBT_HTTP_TIMEOUT moved inside system download call
Raalsky Mar 23, 2020
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### Fixes
- When a jinja value is undefined, give a helpful error instead of failing with cryptic "cannot pickle ParserMacroCapture" errors ([#2110](https://github.com/fishtown-analytics/dbt/issues/2110), [#2184](https://github.com/fishtown-analytics/dbt/pull/2184))
- Added timeout to registry download call ([#2195](https://github.com/fishtown-analytics/dbt/issues/2195), [#2228](https://github.com/fishtown-analytics/dbt/pull/2228))

Contributors:
- [@raalsky](https://github.com/Raalsky) ([#2224](https://github.com/fishtown-analytics/dbt/pull/2224), [#2228](https://github.com/fishtown-analytics/dbt/pull/2228))

## dbt 0.16.0 (Release date TBD)

Expand Down
7 changes: 4 additions & 3 deletions core/dbt/clients/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import requests
import stat
from typing import (
Type, NoReturn, List, Optional, Dict, Any, Tuple, Callable
Type, NoReturn, List, Optional, Dict, Any, Tuple, Callable, Union
)

import dbt.exceptions
Expand Down Expand Up @@ -323,8 +323,9 @@ def run_cmd(
return out, err


def download(url: str, path: str) -> None:
response = requests.get(url)
def download(url: str, path: str, timeout: Union[float, tuple] = None) -> None:
connection_timeout = timeout or float(os.getenv('DBT_HTTP_TIMEOUT', 10))
response = requests.get(url, timeout=connection_timeout)
with open(path, 'wb') as handle:
for block in response.iter_content(1024 * 64):
handle.write(block)
Expand Down