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.

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

Retrieve bias metrics from thanos querier (#1472) (#1473) #1478

Conversation

alexcreasy
Copy link
Contributor

@alexcreasy alexcreasy commented Jul 6, 2023

cherry-pick fix for issue #1472 from f/mserving-metrics to incubation branch.

Description

How Has This Been Tested?

Test Impact

Request review criteria:

Self checklist (all need to be checked):

  • The developer has manually tested the changes and verified that the changes work
  • The commits have meaningful messages (squashes happen on merge by the bot).
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has added tests or explained why testing cannot be added (unit tests & storybook for related changes)

If you have UI changes:

  • Included any necessary screenshots or gifs if it was a UI change.
  • Included tags to the UX team if it was a UI/UX change.

After the PR is posted & before it merges:

  • The developer has tested their solution on a cluster by using the image produced by the PR to main

…datahub-io#1473)

* Retrieve bias metrics from thanos querier (opendatahub-io#1472)

* Implement review feedback

(cherry picked from commit df06394)
Signed-off-by: Alex Creasy <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 6, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign andrewballantyne for approval. For more information see the Kubernetes Code Review Process.

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

@lucferbux
Copy link
Contributor

@alexcreasy why don't you merge f/mserving over the incubation branch?
We are trying to avoid as many cherry-picking as possible, as it's fairly hard to keep track later.

@alexcreasy
Copy link
Contributor Author

alexcreasy commented Jul 6, 2023

@alexcreasy why don't you merge f/mserving over the incubation branch?
We are trying to avoid as many cherry-picking as possible, as it's fairly hard to keep track later.

@lucferbux Because there's no common base between the two branches, it's very difficult to actually do the merge each time. It tries to merge the entire branch history again.

Neither f/mserving-metrics nor incubation is ever rebased off main (for good reason) it gets merged to both branches. The problem that creates though is that, as main is merged via a merge commit into both branches separately it doesn't give a common base to merge off easily.

If I merge main to both branches now - my commit on mserving-metrics will be behind both branches, making the merge near impossible as far as I'm aware.

I've cherry-picked with the -xs flags which will record the sha of the original commit and user who made the cherry pick in the commit message, which makes it a lot easier to see where it has come from.

Just in case anyone reads this in the future, I'd slightly misunderstood the issue. Closing this PR and will attempt a merge commit after fixing the issues preventing them.

@alexcreasy alexcreasy closed this Jul 6, 2023
@alexcreasy alexcreasy deleted the incubation-cherry-pick branch July 6, 2023 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants