Skip to content

OCPBUGS-99298: increase catalog HTTP client timeout from 10s to 5m#768

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.22from
tmshort:backport-ocpbugs-92037
Jul 24, 2026
Merged

OCPBUGS-99298: increase catalog HTTP client timeout from 10s to 5m#768
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.22from
tmshort:backport-ocpbugs-92037

Conversation

@tmshort

@tmshort tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

The 10-second timeout was too aggressive for large catalog responses. Increase it to 5 minutes to avoid timeouts when fetching catalogs.

Also needed to backport "Fix catalogd HA readiness and non-200 cache handling", which the original fix was dependent on.

…t from 10s to 5m

The 10-second timeout was too aggressive for large catalog responses.
Increase it to 5 minutes to avoid timeouts when fetching catalogs.

Signed-off-by: Todd Short <tshort@redhat.com>
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 21, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-99298, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

The 10-second timeout was too aggressive for large catalog responses. Increase it to 5 minutes to avoid timeouts when fetching catalogs.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jul 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: cb30500b-7d3b-448a-800b-635b0e7a7210

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 21, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-99298, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-92037 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-92037 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 21, 2026

@rashmigottipati rashmigottipati left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 21, 2026
@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

@tmshort: The label(s) backport-risk-assessed cannot be applied or removed, because you are not in one of the allowed teams and are not an allowed user. Must be a member of one of these teams: openshift-patch-managers, openshift-release-oversight, openshift-staff-engineers, openshift-sustaining-engineers

Details

In response to this:

/label backport-risk-assessed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-ovn-single-node

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-ovn-single-node

@oceanc80

Copy link
Copy Markdown
Contributor

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 21, 2026
@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-techpreview-olmv1-ext

@tmshort

tmshort commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/test openshift-e2e-aws

@rashmigottipati

Copy link
Copy Markdown
Member

/test e2e-aws-techpreview-olmv1-ext

@rashmigottipati

Copy link
Copy Markdown
Member

/retest

7 similar comments
@rashmigottipati

Copy link
Copy Markdown
Member

/retest

@tmshort

tmshort commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@rashmigottipati

Copy link
Copy Markdown
Member

/retest

@tmshort

tmshort commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@rashmigottipati

Copy link
Copy Markdown
Member

/retest

@tmshort

tmshort commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@perdasilva

Copy link
Copy Markdown
Contributor

/retest

Backport of upstream #2674. In HA topology (replicas=2), the old catalogd
serverutil used OnlyServeWhenLeader=true: the non-leader pod bound the TCP
port via net.Listen so the OS accepted connections, but no HTTP server was
running. Operator-controller hit the non-leader ~50% of the time and the
connection hung silently. With the HTTP client timeout raised to 5m
(OCPBUGS-92037), this hang lasted the full 5 minutes instead of 10s,
causing catalog caches to never be populated within test windows.

Fix:
- catalogd serverutil: switch to NeedLeaderElection=false so all pods serve
  HTTP; non-leaders return 404 (empty local cache) instead of hanging.
  Register a readiness check so the pod is excluded from endpoints until the
  server is ready.
- client.go: do not cache non-200 responses; return the error directly so
  the next reconcile retries a fresh HTTP request and eventually hits the leader.

Upstream: operator-framework/operator-controller#2674
Signed-off-by: Todd Short <tshort@redhat.com>
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2026
@tmshort

tmshort commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

It appears that an HA commit was missed in prior backports, and this backport is dependent on it.

@tmshort

tmshort commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

/test openshift-e2e-aws

This test failure is now different, no OLM errors, so retrying.

@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

@tmshort: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@grokspawn

Copy link
Copy Markdown
Contributor

/approve
/lgtm
/verified-by @grokspawn

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-99298, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-92037 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-92037 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

In response to this:

The 10-second timeout was too aggressive for large catalog responses. Increase it to 5 minutes to avoid timeouts when fetching catalogs.

Also needed to backport "Fix catalogd HA readiness and non-200 cache handling", which the original fix was dependent on.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@rashmigottipati rashmigottipati left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, rashmigottipati, tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@grokspawn

Copy link
Copy Markdown
Contributor

/verified by @grokspawn

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@grokspawn: This PR has been marked as verified by @grokspawn.

Details

In response to this:

/verified by @grokspawn

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot
openshift-merge-bot Bot merged commit f4afcda into openshift:release-4.22 Jul 24, 2026
13 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: Jira Issue Verification Checks: Jira Issue OCPBUGS-99298
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-99298 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

The 10-second timeout was too aggressive for large catalog responses. Increase it to 5 minutes to avoid timeouts when fetching catalogs.

Also needed to backport "Fix catalogd HA readiness and non-200 cache handling", which the original fix was dependent on.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@tmshort
tmshort deleted the backport-ocpbugs-92037 branch July 24, 2026 20:00
@tmshort

tmshort commented Jul 24, 2026

Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.21

@openshift-cherrypick-robot

Copy link
Copy Markdown

@tmshort: new pull request created: #773

Details

In response to this:

/cherry-pick release-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.22.0-0.nightly-2026-07-26-162351

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants