Refresh tokens when needed, not on every download #406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Attached issue: https://pulp.plan.io/issues/7643 |
fao89
reviewed
Nov 3, 2020
bmbouter
force-pushed
the
fix-token-refresh-more-efficiently
branch
2 times, most recently
from
b790e1b
to
92b7f69
Compare
fao89
reviewed
Nov 3, 2020
Comment on lines
+152
to
+157
| if AUTH_TOKEN: | ||
| return AUTH_TOKEN | ||
| async with TOKEN_LOCK: | ||
| if AUTH_TOKEN: | ||
| return AUTH_TOKEN |
There was a problem hiding this comment.
how the refresh happens even with these ifs?
There was a problem hiding this comment.
actually, I was not giving enough time for the tokens to expire:
Nov 03 21:51:00 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:00 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:00 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:00 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:51:01 pulp3-source-fedora31.localhost.example.com gunicorn[36003]: 127.0.0.1 - admin [03/Nov/2020:21:51:01 +0000] "GET /pulp/api/v3/tasks/279b9126-02c6-4f88-a35a-829123583bca/ HTTP/1.1" 200 1237 "-" "OpenAPI-Generator//python"
Nov 03 21:51:02 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
.
.
.
Nov 03 21:53:50 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:53:50 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:53:50 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:53:50 pulp3-source-fedora31.localhost.example.com rq[35999]: pulp: backoff:INFO: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
Nov 03 21:53:50 pulp3-source-fedora31.localhost.example.com rq[35999]: Backing off _run_with_token_refresh_and_401_retry(...) for 0.0s (aiohttp.client_exceptions.ClientResponseError: 401, message='Unauthorized', url=URL('https://cloud.redhat.com/api/automation-hub/v3/collections/check_point/mgmt/versions/?offset=0&limit=100'))
diff:
diff --git a/pulp_ansible/app/tasks/collections.py b/pulp_ansible/app/tasks/collections.py
index 3e1db78..342ff81 100644
--- a/pulp_ansible/app/tasks/collections.py
+++ b/pulp_ansible/app/tasks/collections.py
@@ -4,6 +4,7 @@ from gettext import gettext as _
import json
import logging
import math
+import time
import tarfile
from urllib.parse import urljoin, urlparse, urlunparse
@@ -408,6 +409,7 @@ class CollectionSyncFirstStage(Stage):
page_count = math.ceil(float(count) / float(PAGE_SIZE))
for page in range(1, page_count + 1):
+ time.sleep(120)
url = await _get_url(page, versions_url)
downloader = remote.get_downloader(url=url)
not_done.add(downloader.run())
diff --git a/pulp_ansible/tests/functional/cli/test_collection_install.py b/pulp_ansible/tests/functional/cli/test_collection_install.py
index c40af10..c8bb3f6 100644
--- a/pulp_ansible/tests/functional/cli/test_collection_install.py
+++ b/pulp_ansible/tests/functional/cli/test_collection_install.py
@@ -94,7 +94,6 @@ class InstallCollectionTestCase(unittest.TestCase):
"""Test whether ansible-galaxy can install a Collection hosted by Pulp."""
body = gen_ansible_remote(
url=AUTOMATION_HUB_URL,
- requirements_file="collections:\n - ansible.posix",
auth_url=AH_AUTH_URL,
token=os.environ["AUTOMATION_HUB_TOKEN_AUTH"],
tls_validation=False,
bmbouter
force-pushed
the
fix-token-refresh-more-efficiently
branch
2 times, most recently
from
0954bf1
to
c9196c5
Compare
fao89
reviewed
Nov 4, 2020
pulp_ansible/app/downloaders.py
Outdated
| try: | ||
| return await self._run_with_additional_headers(headers) | ||
| except ClientResponseError as exc: | ||
| if exc.status is 401: |
There was a problem hiding this comment.
Suggested change
| if exc.status is 401: | |
| if exc.status == 401: |
There was a problem hiding this comment.
fixing in next push along w/ CI. Thanks!
closes #7643
bmbouter
force-pushed
the
fix-token-refresh-more-efficiently
branch
from
c9196c5
to
7faf2d3
Compare
fao89
approved these changes
Nov 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #7643