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

implements copy-on-write for vote-accounts (backport #19362)#22139

Merged
mergify[bot] merged 1 commit intov1.8from
mergify/bp/v1.8/pr-19362
Dec 28, 2021
Merged

implements copy-on-write for vote-accounts (backport #19362)#22139
mergify[bot] merged 1 commit intov1.8from
mergify/bp/v1.8/pr-19362

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 28, 2021

This is an automatic backport of pull request #19362 done by Mergify.
Cherry-pick of 8ad52fa has failed:

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

You are currently cherry-picking commit 8ad52fa09.
  (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)

Changes to be committed:
	modified:   core/src/commitment_service.rs
	modified:   core/src/replay_stage.rs
	modified:   core/src/validator.rs
	modified:   ledger-tool/src/main.rs
	modified:   runtime/src/epoch_stakes.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/cluster_info_vote_listener.rs
	both modified:   core/src/consensus.rs
	both modified:   ledger/src/blockstore_processor.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/stakes.rs
	both modified:   runtime/src/vote_account.rs

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 Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-19362 branch from 51bdf48 to c6142ed Compare December 28, 2021 08:18
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-19362 branch from c6142ed to 774112d Compare December 28, 2021 08:21
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@carllin carllin added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-19362 branch from 774112d to 4370c45 Compare December 28, 2021 08:37
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin added blocked Unable to proceed and removed automerge Merge this Pull Request automatically once CI passes labels Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the blocked Unable to proceed label Dec 28, 2021
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@carllin carllin removed the conflicts label Dec 28, 2021
@behzadnouri
Copy link
Copy Markdown
Contributor

@carllin I will take care of merge conflicts

@behzadnouri
Copy link
Copy Markdown
Contributor

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

rebase

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/4)
Auto-merging runtime/src/vote_account.rs
CONFLICT (content): Merge conflict in runtime/src/vote_account.rs
error: could not apply df99a856f... makes solana_runtime::vote_account::VoteAccount private
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply df99a856f... makes solana_runtime::vote_account::VoteAccount private

err-code: 35B49

Bank::vote_accounts redundantly clones vote-accounts HashMap even though
an immutable reference will suffice:
https://github.com/solana-labs/solana/blob/95c998a19/runtime/src/bank.rs#L5174-L5186

This commit implements copy-on-write semantics for vote-accounts by
wrapping the underlying HashMap in Arc<...>.
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-19362 branch from 4370c45 to b814047 Compare December 28, 2021 19:05
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 28, 2021

Codecov Report

Merging #22139 (b814047) into v1.8 (262b157) will increase coverage by 0.0%.
The diff coverage is 98.6%.

@@           Coverage Diff           @@
##             v1.8   #22139   +/-   ##
=======================================
  Coverage    81.5%    81.5%           
=======================================
  Files         459      459           
  Lines      130618   130661   +43     
=======================================
+ Hits       106548   106603   +55     
+ Misses      24070    24058   -12     

@mergify mergify Bot merged commit a305fa0 into v1.8 Dec 28, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-19362 branch December 28, 2021 21:18
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 3, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants