Skip to content

CLOUDDST-28603: Add retry on ErrataClient._call_et #666

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
rbikar merged 2 commits into from
Oct 6, 2025
Merged

CLOUDDST-28603: Add retry on ErrataClient._call_et #666

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
38a5a91
CLOUDDST-28603: Add retry on ErrataClient._call_et
JAVGan Jul 22, 2025
36d308f
Errata: Use retry from requests library
JAVGan Aug 6, 2025
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
13 changes: 13 additions & 0 deletions src/pushsource/_impl/backend/errata_source/errata_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
import threading
import xmlrpc.client as xmlrpc_client # nosec B411
from urllib.parse import urljoin
from urllib3.util.retry import Retry
import warnings

import gssapi
from more_executors import Executors
from more_executors.futures import f_zip, f_map
import requests
import requests.adapters
import requests_gssapi

from ...compat_attr import attr
Expand All @@ -21,6 +23,14 @@

USE_XMLRPC_CLIENT = os.environ.get("PUSHSOURCE_ERRATA_USE_XMLRPC_API") == "1"

ERRATA_RETRY_STRATEGY = Retry(
total=5,
status_forcelist=range(500, 600),
backoff_factor=2,
allowed_methods=frozenset(["GET", "POST"]),
raise_on_status=False,
)


def get_errata_client(
threads,
Expand Down Expand Up @@ -289,6 +299,9 @@ def _errata_service(self):

session = requests.Session()
session.auth = requests_gssapi.HTTPSPNEGOAuth(creds=creds)
adapter = requests.adapters.HTTPAdapter(max_retries=ERRATA_RETRY_STRATEGY)
session.mount("https://", adapter)
session.mount("http://", adapter)
self._tls.session = session

return self._tls.session
Expand Down
2 changes: 2 additions & 0 deletions tests/errata/fake_errata_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import yaml
import json
from xmlrpc.client import Fault # nosec B411
from urllib3.util.retry import Retry

import requests

Expand Down Expand Up @@ -54,6 +55,7 @@ class FakeErrataToolProxy(object):
def __init__(self, controller):
self._ctrl = controller
self.auth = None
self.mount = Mock(spec=Retry)
self.url_map = [
(".*/api/v1/erratum/(.*)", self.get_advisory_data),
(
Expand Down
8 changes: 7 additions & 1 deletion tests/errata/test_errata_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import requests

from pushsource._impl.backend.errata_source.errata_client import (
ERRATA_RETRY_STRATEGY,
ErrataHTTPClient,
get_errata_client,
)
Expand Down Expand Up @@ -35,11 +36,14 @@ def test_init_env_vars():
assert client.principal == "pub-errata@IPA.REDHAT.COM"


@mock.patch("requests.adapters.HTTPAdapter")
@mock.patch("gssapi.Name")
@mock.patch("gssapi.Credentials.acquire")
@mock.patch("requests.Session")
@mock.patch("requests_gssapi.HTTPSPNEGOAuth")
def test_get_session(mock_auth, mock_session, mock_acquire, mock_name, caplog):
def test_get_session(
mock_auth, mock_session, mock_acquire, mock_name, mock_adapter, caplog
):
caplog.set_level(logging.DEBUG)

client = ErrataHTTPClient(
Expand All @@ -57,6 +61,8 @@ def test_get_session(mock_auth, mock_session, mock_acquire, mock_name, caplog):
)
mock_session.assert_called_once_with()
mock_auth.assert_called_once_with(creds=mock_acquire.return_value.creds)
mock_adapter.assert_called_once_with(max_retries=ERRATA_RETRY_STRATEGY)
assert session.mount.call_count == 2

assert session == mock_session.return_value
assert client._tls.session == mock_session.return_value
Expand Down