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

Add execute metrics (backport #22296) #22334

Merged
merged 4 commits into from Jan 18, 2022
Merged

Add execute metrics (backport #22296) #22334

merged 4 commits into from Jan 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 6, 2022

This is an automatic backport of pull request #22296 done by Mergify.
Cherry-pick of 7d32909 has failed:

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

You are currently cherry-picking commit 7d32909e1.
  (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:   Cargo.lock
	modified:   core/src/cost_update_service.rs
	modified:   core/src/replay_stage.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/Cargo.toml
	both modified:   core/src/banking_stage.rs
	both modified:   ledger/Cargo.toml
	both modified:   ledger/src/blockstore_processor.rs
	deleted by us:   program-runtime/src/timings.rs
	both modified:   program-test/src/lib.rs
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/bpf/tests/programs.rs
	both modified:   runtime/src/bank.rs

Cherry-pick of b25e4a2 has failed:

On branch mergify/bp/v1.8/pr-22296
Your branch is ahead of 'origin/v1.8' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b25e4a200.
  (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/cost_update_service.rs
	modified:   core/src/progress_map.rs
	modified:   core/src/replay_stage.rs
	modified:   program-runtime/src/timings.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	deleted by us:   program-runtime/Cargo.toml
	deleted by us:   program-runtime/src/invoke_context.rs
	both modified:   program-test/src/lib.rs
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.rs

Cherry-pick of 848b6df has failed:

On branch mergify/bp/v1.8/pr-22296
Your branch is ahead of 'origin/v1.8' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 848b6dfbd.
  (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/progress_map.rs
	modified:   program-runtime/src/timings.rs

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

Cherry-pick of 72fc609 has failed:

On branch mergify/bp/v1.8/pr-22296
Your branch is ahead of 'origin/v1.8' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 72fc6096a.
  (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:   program-runtime/src/invoke_context.rs
	modified:   program-runtime/src/timings.rs
	modified:   programs/bpf_loader/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 6, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 6, 2022

automerge label removed due to a CI failure

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

mergify bot commented Jan 18, 2022

automerge label removed due to a CI failure

@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 Jan 18, 2022
@codecov
Copy link

codecov bot commented Jan 18, 2022

Codecov Report

Merging #22334 (eb6dbe6) into v1.8 (81e65ea) will increase coverage by 0.0%.
The diff coverage is 92.7%.

@@           Coverage Diff            @@
##             v1.8   #22334    +/-   ##
========================================
  Coverage    81.6%    81.6%            
========================================
  Files         459      460     +1     
  Lines      131283   131440   +157     
========================================
+ Hits       107159   107289   +130     
- Misses      24124    24151    +27     

@mergify mergify bot merged commit aabcdcf into v1.8 Jan 18, 2022
@mergify mergify bot deleted the mergify/bp/v1.8/pr-22296 branch January 18, 2022 19:21
@github-actions
Copy link
Contributor

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 Mar 31, 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.

None yet

2 participants