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

Reduce grace ticks, and ignore grace ticks for missing leaders (bp #7764) #7779

Merged
merged 1 commit into from
Jan 17, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 13, 2020

This is an automated backport of pull request #7764 done by Mergify.io

Cherry-pick of 156292e has failed:

On branch mergify/bp/v0.22/pr-7764
Your branch is up to date with 'origin/v0.22'.

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/src/poh_recorder.rs
	both modified:   ledger/src/lib.rs

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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 simulator.

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

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 14, 2020
@codecov
Copy link

codecov bot commented Jan 14, 2020

Codecov Report

❗ No coverage uploaded for pull request base (v0.22@6c2534a). Click here to learn what that means.
The diff coverage is 71.7%.

@@           Coverage Diff           @@
##             v0.22   #7779   +/-   ##
=======================================
  Coverage         ?   66.3%           
=======================================
  Files            ?     243           
  Lines            ?   62959           
  Branches         ?       0           
=======================================
  Hits             ?   41798           
  Misses           ?   21161           
  Partials         ?       0

@carllin
Copy link
Contributor

carllin commented Jan 16, 2020

@pgarg66, looks like there are conflicts :(

@mvines
Copy link
Contributor

mvines commented Jan 16, 2020

Oh crap, I didn't see that this didn't make it into 0.22.3 😢

@pgarg66
Copy link
Contributor

pgarg66 commented Jan 17, 2020

Oh crap, I didn't see that this didn't make it into 0.22.3 😢

It is due to missing blocktree -> blockstore rename PR. Do we plan to merge that to v22? If not, I can rework this PR to use blocktree

@garious
Copy link
Contributor

garious commented Jan 17, 2020

Blockstore PR should already be in 0.22

@pgarg66
Copy link
Contributor

pgarg66 commented Jan 17, 2020

Blockstore PR should already be in 0.22

Let me check. Maybe some other overlapping change is causing the merge conflicts then.

@pgarg66
Copy link
Contributor

pgarg66 commented Jan 17, 2020

Blockstore PR should already be in 0.22

Let me check. Maybe some other overlapping change is causing the merge conflicts then.

Looks like the ordering of backport caused these merge conflicts. I am rebasing the PR manually.

* Reduce grace ticks, and ignore grace ticks for missing leaders

* address review comments

* blockstore related renames

(cherry picked from commit 156292e)

# Conflicts:
#	core/src/poh_recorder.rs
#	ledger/src/lib.rs
@pgarg66 pgarg66 force-pushed the mergify/bp/v0.22/pr-7764 branch from c70fd04 to 2db1bbd Compare January 17, 2020 03:10
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 17, 2020
@solana-grimes solana-grimes merged commit 344c528 into v0.22 Jan 17, 2020
@mergify mergify bot deleted the mergify/bp/v0.22/pr-7764 branch January 17, 2020 03:58
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants