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

Jump to bottom

Add timeout option in connection wrapper (#119) #336

Open
wants to merge 1 commit into
base: unreleased
Choose a base branch
from
Open

Add timeout option in connection wrapper (#119) #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion bin/qds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,11 @@ def main():
help="Number of re-attempts for an api-call in case of "
" retryable exceptions. Defaults to 7.")

optparser.add_option("--timeout", dest="timeout",
type=int,
default=os.getenv('QDS_TIMEOUT'),
help="number of seconds to await response from QDS. defaults to 300s")

optparser.add_option("-v", dest="verbose", action="store_true",
default=False,
help="verbose mode - info level logging")
Expand Down Expand Up @@ -639,6 +644,9 @@ def main():
if options.base_retry_delay is None:
options.base_retry_delay = 10

if options.timeout is None:
options.timeout = 300

if options.cloud_name is None:
options.cloud_name = "AWS"

Expand All @@ -654,7 +662,8 @@ def main():
skip_ssl_cert_check=options.skip_ssl_cert_check,
cloud_name=options.cloud_name,
base_retry_delay=options.base_retry_delay,
max_retries=options.max_retries
max_retries=options.max_retries,
timeout=options.timeout
)

if len(args) < 1:
Expand Down
13 changes: 7 additions & 6 deletions qds_sdk/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Connection:

def __init__(self, auth, rest_url, skip_ssl_cert_check,
reuse=True, max_retries=7,
base_retry_delay=10):
base_retry_delay=10, timeout=300):
self.auth = auth
self.rest_url = rest_url
self.skip_ssl_cert_check = skip_ssl_cert_check
Expand All @@ -47,6 +47,7 @@ def __init__(self, auth, rest_url, skip_ssl_cert_check,
self.reuse = reuse
self.max_retries = max_retries
self.base_retry_delay = base_retry_delay
self.timeout = timeout
if reuse:
self.session = requests.Session()
self.session.mount('https://', RequestAdapter())
Expand Down Expand Up @@ -109,7 +110,7 @@ def _api_call_raw(self, req_type, path, data=None, params=None):
x_with_retries = requests.Session()
x_with_retries.mount('https://', RequestAdapter(max_retries=3))

kwargs = {'headers': self._headers, 'auth': self.auth, 'verify': not self.skip_ssl_cert_check}
kwargs = {'headers': self._headers, 'auth': self.auth, 'verify': not self.skip_ssl_cert_check, 'timeout': self.timeout}

if data:
kwargs['data'] = json.dumps(data)
Expand All @@ -121,13 +122,13 @@ def _api_call_raw(self, req_type, path, data=None, params=None):
log.info("Params: %s" % params)

if req_type == 'GET':
r = x_with_retries.get(url, timeout=300, **kwargs)
r = x_with_retries.get(url, **kwargs)
elif req_type == 'POST':
r = x.post(url, timeout=300, **kwargs)
r = x.post(url, **kwargs)
elif req_type == 'PUT':
r = x.put(url, timeout=300, **kwargs)
r = x.put(url, **kwargs)
elif req_type == 'DELETE':
r = x.delete(url, timeout=300, **kwargs)
r = x.delete(url, **kwargs)
else:
raise NotImplemented

Expand Down
9 changes: 6 additions & 3 deletions qds_sdk/qubole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Qubole:
MIN_POLL_INTERVAL = 1
RETRIES_CAP = 7
MAX_RETRY_DELAY = 10
TIMEOUT = 300

_auth = None
api_token = None
Expand All @@ -40,7 +41,7 @@ class Qubole:
def configure(cls, api_token,
api_url="https://api.qubole.com/api/", version="v1.2",
poll_interval=5, skip_ssl_cert_check=False, cloud_name="AWS",
base_retry_delay=10, max_retries=7):
base_retry_delay=10, max_retries=7, timeout=300):
"""
Set parameters governing interaction with QDS
Args:
Expand All @@ -51,6 +52,7 @@ def configure(cls, api_token,
`delay` : interval in secs to sleep in between successive retries
`retries` : maximum number of time to retry an api call in case
of retryable exception.
`timeout` : maximum time in secs to wait for response from QDS
"""

cls._auth = QuboleAuth(api_token)
Expand Down Expand Up @@ -81,6 +83,7 @@ def configure(cls, api_token,
cls.max_retries = Qubole.RETRIES_CAP
else:
cls.max_retries = max_retries
cls.timeout = timeout

@classmethod
def agent(cls, version=None):
Expand All @@ -105,12 +108,12 @@ def agent(cls, version=None):
if not reuse_cached_agent:
uncached_agent = Connection(cls._auth, cls.rest_url,
cls.skip_ssl_cert_check,
True, cls.max_retries, cls.base_retry_delay)
True, cls.max_retries, cls.base_retry_delay, cls.timeout)
return uncached_agent
if cls.cached_agent is None:
cls.cached_agent = Connection(cls._auth, cls.rest_url,
cls.skip_ssl_cert_check,
True, cls.max_retries, cls.base_retry_delay)
True, cls.max_retries, cls.base_retry_delay, cls.timeout)

return cls.cached_agent

Expand Down