Skip to content

Bug 1843678: Deleting a CSV removes related CSV metrics #1568

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
Merged
merged 1 commit into from
Jun 19, 2020
Merged

Bug 1843678: Deleting a CSV removes related CSV metrics #1568

merged 1 commit into from
Jun 19, 2020

Conversation

harishsurf
Copy link
Contributor

Description of the change:

Backport PR #1525 bug fix to 4.4

Signed-off-by: Harish [email protected]

Motivation for the change:

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@harishsurf
Deleting a CSV removes related CSV metrics
2eb4c7d 
Problem: Bug 1843678: When creating a CSV fails, deleting it did
not clear the CSV metrics. So when the same CSV was created
again and allowed to succeed, the olm pod still retained the
old CSV metrics

Solution: Deleting a CSV will now clear its related metrics
from the olm pod

Signed-off-by: Harish <[email protected]>
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jun 3, 2020
@openshift-ci-robot
Copy link
Collaborator

@harishsurf: This pull request references Bugzilla bug 1843678, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.4.z) matches configured target release for branch (4.4.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1819308 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1819308 targets the "4.5.0" release, which is one of the valid target releases: 4.5.0, 4.5.z
  • bug has dependents

In response to this:

Bug 1843678: Deleting a CSV removes related CSV metrics

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jun 3, 2020
awgreene
awgreene approved these changes Jun 4, 2020
View reviewed changes
Copy link
Member

@awgreene awgreene left a comment

Choose a reason for hiding this comment

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

/approve

@awgreene
Copy link
Member

awgreene commented Jun 4, 2020

/retest

awgreene
awgreene reviewed Jun 4, 2020
View reviewed changes
pkg/metrics/metrics.go
Comment on lines +191 to +192
func DeleteCSVMetric(oldCSV *olmv1alpha1.ClusterServiceVersion) {
// Delete the old CSV metrics
Copy link
Member

Choose a reason for hiding this comment

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

Non-blocking nit: Please add comments to exported functions.

@awgreene
Copy link
Member

awgreene commented Jun 4, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2020
@harishsurf
Copy link
Contributor Author

/retest

anik120
anik120 approved these changes Jun 12, 2020
View reviewed changes
Copy link
Contributor

@anik120 anik120 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

/approve
It slipped my mind that I don't have approve privileges on this repo.
Nonetheless, the sentiment still holds true :)

@kevinrizza
Copy link
Member

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2020
@njhale
Copy link
Member

njhale commented Jun 17, 2020

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, awgreene, harishsurf, kevinrizza, njhale

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

The pull request process is described 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

@bparees bparees added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 18, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 759ff45 into operator-framework:release-4.4 Jun 19, 2020
@openshift-ci-robot
Copy link
Collaborator

@harishsurf: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1568. Bugzilla bug 1843678 has been moved to the MODIFIED state.

In response to this:

Bug 1843678: Deleting a CSV removes related CSV metrics

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/test-infra repository.

@harishsurf harishsurf deleted the csv-abnormal-4.4 branch July 7, 2020 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awgreene awgreene awgreene approved these changes

@anik120 anik120 anik120 approved these changes

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

@njhale njhale Awaiting requested review from njhale

Assignees

@awgreene awgreene

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@harishsurf @openshift-ci-robot @awgreene @kevinrizza @njhale @openshift-bot @anik120 @bparees @openshift-merge-robot