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

Count compute units even when transaction errors (backport #22059)#22154

Merged
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22059
Dec 29, 2021
Merged

Count compute units even when transaction errors (backport #22059)#22154
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22059

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 28, 2021

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

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

You are currently cherry-picking commit eaa8c67bd.
  (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/banking_stage.rs
	modified:   core/src/cost_update_service.rs
	modified:   core/src/qos_service.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   program-runtime/src/timings.rs
	modified:   program-test/src/lib.rs
	modified:   programs/bpf_loader/src/syscalls.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/cost_model.rs
	modified:   runtime/src/transaction_batch.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/invoke_context.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.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

(cherry picked from commit eaa8c67)

# Conflicts:
#	program-runtime/src/invoke_context.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
@mergify mergify Bot added the conflicts label Dec 28, 2021
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels 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 added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 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 29, 2021
@carllin carllin force-pushed the mergify/bp/v1.9/pr-22059 branch from fe0d14f to e8366ff Compare December 29, 2021 06:07
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 29, 2021

Codecov Report

Merging #22154 (e8366ff) into v1.9 (adc584e) will increase coverage by 0.0%.
The diff coverage is 96.9%.

@@           Coverage Diff            @@
##             v1.9   #22154    +/-   ##
========================================
  Coverage    81.1%    81.1%            
========================================
  Files         516      516            
  Lines      144530   144646   +116     
========================================
+ Hits       117334   117445   +111     
- Misses      27196    27201     +5     

@mergify mergify Bot merged commit 401c542 into v1.9 Dec 29, 2021
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22059 branch December 29, 2021 08:04
carllin added a commit to carllin/solana that referenced this pull request Dec 29, 2021
carllin added a commit to carllin/solana that referenced this pull request Dec 30, 2021
carllin added a commit that referenced this pull request Dec 30, 2021
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@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 conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant