Skip to content

Maprdb 2230 #64

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

Merged
dshylov merged 2 commits into from
Apr 21, 2020
Merged

Maprdb 2230 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c8ff9
MAPRDB-2230 OJAI Python Client query fails with STATUS TOKEN EXPIRED
Apr 10, 2020
c0f096c
update to 1.1.3 version
Apr 21, 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
2 changes: 1 addition & 1 deletion mapr/ojai/storage/OJAIConnection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def is_store_exists(self, store_path):
elif response.error.err_code == ErrorCode.Value('TABLE_NOT_FOUND'):
return False
else:
raise UnknownServerError
raise UnknownServerError(m=response.error.error_message)

def delete_store(self, store_path):
self.__validate_store_path(store_path=store_path)
Expand Down
1 change: 1 addition & 0 deletions mapr/ojai/storage/auth_interceptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def metadata_builder(self):
value = 'basic {0}'.format(self._encoded_user_creds)
else:
value = 'bearer {0}'.format(self._token)
self._token = None
return 'authorization', value

def set_jwt_token(self, call, stream=False):
Expand Down
7 changes: 6 additions & 1 deletion mapr/ojai/utils/retry_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ def __init__(self,
# Retry checker function
def retry_if_connection_not_established(exception):
if isinstance(exception, _Rendezvous):
return exception.code() == StatusCode.UNAVAILABLE or exception.code() == StatusCode.RESOURCE_EXHAUSTED
if exception.code() == StatusCode.UNAUTHENTICATED \
and exception.details() == 'STATUS_TOKEN_EXPIRED':
return True
else:
return exception.code() == StatusCode.UNAVAILABLE \
or exception.code() == StatusCode.RESOURCE_EXHAUSTED
elif isinstance(exception, ExpiredTokenError):
return True
else:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


setup(name='maprdb_python_client',
version='1.1.2',
version='1.1.3',
description='MapR-DB Python Client',
url='https://github.com/mapr/maprdb-python-client/',
author='MapR, Inc.',
Expand Down