Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

patches bug in retransmit stats where slot stats are erroneously dropped (backport #26317) #26324

Merged
merged 2 commits into from
Jun 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2022

This is an automatic backport of pull request #26317 done by Mergify.
Cherry-pick of f875733 has failed:

On branch mergify/bp/v1.10/pr-26317
Your branch is up to date with 'origin/v1.10'.

You are currently cherry-picking commit f875733a9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/retransmit_stage.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jun 29, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 29, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 29, 2022
@behzadnouri
Copy link
Contributor

@Mergifyio rebase

…ped (#26317)

slot_stats are submitted at a different cadence from the rest of
RetransmitStats. Current code erroneously clears slot_stats before
submitting any metrics.

(cherry picked from commit f875733)

# Conflicts:
#	core/src/retransmit_stage.rs
@mergify
Copy link
Contributor Author

mergify bot commented Jun 30, 2022

rebase

✅ Branch has been successfully rebased

@joeaba joeaba force-pushed the mergify/bp/v1.10/pr-26317 branch from 50e5b23 to 1f23e82 Compare June 30, 2022 12:18
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 30, 2022
@mergify mergify bot merged commit db490d5 into v1.10 Jun 30, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-26317 branch June 30, 2022 13:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant