Merge pull request #64 from mapr/MAPRDB-2230

Fixed token renewal logic
Updated version

Author: dshylov

mapr/ojai/storage/OJAIConnection.py

@@ -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)

mapr/ojai/storage/auth_interceptor.py

@@ -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):

mapr/ojai/utils/retry_utils.py

@@ -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:

setup.py

@@ -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.',