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

add metrics for startup (backport #17913) #17975

Merged
merged 1 commit into from
Jun 16, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2021

This is an automatic backport of pull request #17913 done by Mergify.
Cherry-pick of 471b341 has failed:

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

You are currently cherry-picking commit 471b34132.
  (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/tests/snapshots.rs
	modified:   ledger/src/blockstore_processor.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/bank_forks_utils.rs
	both modified:   runtime/src/snapshot_utils.rs

To fix up this pull request, you can check it out 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 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.io/

@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 Jun 15, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 15, 2021

automerge label removed due to a CI failure

    * add metrics for startup

    * roll timings up higher

    * fix test

    * fix duplicate

    (cherry picked from commit 471b341)

    # Conflicts:
    #       ledger/src/bank_forks_utils.rs
    #       runtime/src/snapshot_utils.rs
conflicts because #17778 is not present.
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17913 branch from 8e57188 to 4238b7c Compare June 15, 2021 22:22
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 15, 2021
@codecov
Copy link

codecov bot commented Jun 16, 2021

Codecov Report

Merging #17975 (4238b7c) into v1.7 (fe5fed1) will increase coverage by 0.0%.
The diff coverage is 63.1%.

@@           Coverage Diff           @@
##             v1.7   #17975   +/-   ##
=======================================
  Coverage    82.4%    82.4%           
=======================================
  Files         432      432           
  Lines      120245   120271   +26     
=======================================
+ Hits        99181    99215   +34     
+ Misses      21064    21056    -8     

@mergify mergify bot merged commit 6157375 into v1.7 Jun 16, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17913 branch June 16, 2021 02:01
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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