Skip to content
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

Jump to bottom

cluster load: Refresh prometheus_api connection in case of connection error #11327

Merged
merged 4 commits into from
Feb 17, 2025
Merged

cluster load: Refresh prometheus_api connection in case of connection error #11327

merged 4 commits into from
Feb 17, 2025

Conversation

ebenahar
Copy link
Contributor

@ebenahar ebenahar commented Feb 9, 2025 •
edited
Loading

Fixes #11328

@ebenahar ebenahar requested a review from a team as a code owner February 9, 2025 14:00
@pull-request-size pull-request-size bot added the size/S PR that changes 10-29 lines label Feb 9, 2025
DanielOsypenko
DanielOsypenko reviewed Feb 9, 2025
View reviewed changes
ocs_ci/ocs/cluster_load.py Outdated
)[0]["value"][1]
)
except requests.exceptions.RequestException as e:
print(f"Encountered error: {e}. Refreshing connection and retrying...")
Copy link
Contributor

Choose a reason for hiding this comment

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

not critical, but better to replace print with log.error ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@ebenahar
replace pring with log
75788d2 
Signed-off-by: Elad Ben Aharon <[email protected]>
@pull-request-size pull-request-size bot added size/M PR that changes 30-99 lines and removed size/S PR that changes 10-29 lines labels Feb 10, 2025
@ebenahar
revert setup.py changes
f1d8344 
Signed-off-by: Elad Ben Aharon <[email protected]>
@pull-request-size pull-request-size bot added size/S PR that changes 10-29 lines and removed size/M PR that changes 30-99 lines labels Feb 10, 2025
ocs-ci
ocs-ci reviewed Feb 10, 2025
View reviewed changes
Copy link

@ocs-ci ocs-ci left a comment

Choose a reason for hiding this comment

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

PR validation

Cluster Name:
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/
Additional Test Params: --io-in-bg --log-cluster-utilization
OCP VERSION: 4.18
OCS VERSION: 4.18
tested against branch: master

Job FAILED (installation failed, tests not executed).

petr-balogh
petr-balogh previously approved these changes Feb 10, 2025
View reviewed changes
@openshift-ci openshift-ci bot added the lgtm label Feb 10, 2025
@petr-balogh
Copy link
Member

Triggered verification job here:
https://url.corp.redhat.com/2fedb4d

@petr-balogh
Copy link
Member

Another verification here:
https://url.corp.redhat.com/1974e44

ocs-ci
ocs-ci reviewed Feb 11, 2025
View reviewed changes
Copy link

@ocs-ci ocs-ci left a comment

Choose a reason for hiding this comment

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

PR validation

Cluster Name:
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/
Additional Test Params: --io-in-bg --log-cluster-utilization
OCP VERSION: 4.18
OCS VERSION: 4.18
tested against branch: master

Job UNSTABLE (some or all tests failed).

vavuthu
vavuthu previously approved these changes Feb 12, 2025
View reviewed changes
@ebenahar
Add IndexError
0686d04 
Signed-off-by: Elad Ben Aharon <[email protected]>
@ebenahar ebenahar dismissed stale reviews from vavuthu and petr-balogh via 0686d04 February 12, 2025 10:54
@openshift-ci openshift-ci bot removed the lgtm label Feb 12, 2025
@petr-balogh
Copy link
Member

Triggered new validation:
https://url.corp.redhat.com/cc754c8
Where I cherrypicked commits from your PR here and my PR:
#11385

@petr-balogh petr-balogh mentioned this pull request Feb 12, 2025
Merged
ocs-ci
ocs-ci reviewed Feb 13, 2025
View reviewed changes
Copy link

@ocs-ci ocs-ci left a comment

Choose a reason for hiding this comment

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

PR validation

Cluster Name:
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/
Additional Test Params: --io-in-bg --log-cluster-utilization
OCP VERSION: 4.18
OCS VERSION: 4.18
tested against branch: master

Job UNSTABLE (some or all tests failed).

@openshift-ci openshift-ci bot added the lgtm label Feb 17, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Feb 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dahorak, ebenahar, petr-balogh

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

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

@petr-balogh petr-balogh merged commit 6c3be3e into red-hat-storage:master Feb 17, 2025
6 of 8 checks passed
@petr-balogh
Copy link
Member

/cherry-pick release-4.17

@petr-balogh
Copy link
Member

/cherry-pick release-4.16

@petr-balogh
Copy link
Member

/cherry-pick release-4.15

@petr-balogh
Copy link
Member

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link
Collaborator

@petr-balogh: new pull request created: #11420

In response to this:

/cherry-pick release-4.17

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 17, 2025
Merged
@openshift-cherrypick-robot
Copy link
Collaborator

@petr-balogh: #11327 failed to apply on top of branch "release-4.16":

Applying: cluster load: Refresh prometheus_api connection in case of connection error
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/cluster_load.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/cluster_load.py
Applying: replace pring with log
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/cluster_load.py
M	setup.py
Falling back to patching base and 3-way merge...
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
Auto-merging ocs_ci/ocs/cluster_load.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 replace pring with log

In response to this:

/cherry-pick release-4.16

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-cherrypick-robot
Copy link
Collaborator

@petr-balogh: #11327 failed to apply on top of branch "release-4.15":

Applying: cluster load: Refresh prometheus_api connection in case of connection error
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/cluster_load.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/cluster_load.py
Applying: replace pring with log
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/cluster_load.py
M	setup.py
Falling back to patching base and 3-way merge...
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
Auto-merging ocs_ci/ocs/cluster_load.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 replace pring with log

In response to this:

/cherry-pick release-4.15

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-cherrypick-robot
Copy link
Collaborator

@petr-balogh: #11327 failed to apply on top of branch "release-4.14":

Applying: cluster load: Refresh prometheus_api connection in case of connection error
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/cluster_load.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/cluster_load.py
Applying: replace pring with log
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/cluster_load.py
M	setup.py
Falling back to patching base and 3-way merge...
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
Auto-merging ocs_ci/ocs/cluster_load.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 replace pring with log

In response to this:

/cherry-pick release-4.14

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.

This was referenced Feb 17, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ocs-ci ocs-ci ocs-ci left review comments

@DanielOsypenko DanielOsypenko DanielOsypenko left review comments

@dahorak dahorak dahorak approved these changes

@petr-balogh petr-balogh petr-balogh approved these changes

@vavuthu vavuthu vavuthu left review comments

Assignees

@dahorak dahorak

@petr-balogh petr-balogh

@vavuthu vavuthu

Labels
lgtm size/S PR that changes 10-29 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ClusterLoad: Sometimes the connection with Prometheus gets closed
7 participants
@ebenahar @petr-balogh @openshift-cherrypick-robot @dahorak @vavuthu @ocs-ci @DanielOsypenko