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.

Sign up for GitHub

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

Jump to bottom

[Execution] Minor ingestion logging cleanup #3522

Merged
merged 1 commit into from
Nov 9, 2022
Merged

[Execution] Minor ingestion logging cleanup #3522

merged 1 commit into from
Nov 9, 2022

Conversation

SaveTheRbtz
Copy link
Contributor

Use proper logger.

@codecov-commenter
Copy link

codecov-commenter commented Nov 6, 2022 •
edited
Loading

Codecov Report

Merging #3522 (c344937) into master (4f76933) will decrease coverage by 0.73%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #3522      +/-   ##
==========================================
- Coverage   55.28%   54.55%   -0.74%     
==========================================
  Files         754      721      -33     
  Lines       69041    63207    -5834     
==========================================
- Hits        38170    34483    -3687     
+ Misses      27742    26053    -1689     
+ Partials     3129     2671     -458
Flag Coverage Δ
unittests 54.55% <0.00%> (-0.74%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
engine/execution/ingestion/engine.go 54.46% <0.00%> (+0.12%) ⬆️
...s/hotstuff/votecollector/staking_vote_processor.go 83.87% <0.00%> (-3.23%) ⬇️
engine/access/apiproxy/access_api_proxy.go 15.44% <0.00%> (-1.63%) ⬇️
consensus/hotstuff/eventloop/event_loop.go 73.46% <0.00%> (-1.37%) ⬇️
admin/command_runner.go 82.12% <0.00%> (ø)
fvm/environment/contract_updater.go 66.88% <0.00%> (ø)
ledger/common/hash/sha3.go
ledger/complete/mtrie/flattener/encoding_v4.go
ledger/complete/wal/checksum.go
ledger/complete/mtrie/flattener/iterator.go
... and 30 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2022

FVM Benchstat comparison

This branch with compared with the base branch onflow:master commit 4f76933

The command (for i in {1..10}; do go test ./fvm ./engine/execution/computation --bench . --tags relic -shuffle=on --benchmem --run ^$; done) was used.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/get_account_and_get_balance-2280ms ± 3%291ms ± 3%+4.04%(p=0.000 n=9+10)
RuntimeTransaction/get_signer_receiver-249.4ms ± 6%51.4ms ± 4%+4.01%(p=0.013 n=10+9)
RuntimeTransaction/convert_int_to_string-232.7ms ± 4%34.0ms ± 4%+4.00%(p=0.006 n=9+8)
RuntimeTransaction/get_account_and_get_storage_capacity-2221ms ± 7%229ms ± 5%+3.66%(p=0.017 n=9+10)
RuntimeTransaction/copy_array_from_storage-2134ms ± 4%138ms ± 5%+3.26%(p=0.017 n=9+10)
RuntimeTransaction/transfer_tokens-2197ms ± 2%202ms ± 4%+2.07%(p=0.035 n=9+10)
RuntimeNFTBatchTransfer-2122ms ± 5%124ms ± 5%~(p=0.447 n=9+10)
RuntimeTransaction/reference_tx-231.9ms ±11%32.5ms ± 6%~(p=0.274 n=10+8)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-236.1ms ±19%36.7ms ±10%~(p=0.278 n=10+9)
RuntimeTransaction/get_signer_address-233.3ms ±11%32.7ms ± 6%~(p=0.780 n=10+9)
RuntimeTransaction/get_public_account-234.1ms ± 7%35.3ms ± 7%~(p=0.190 n=10+10)
RuntimeTransaction/get_account_and_get_available_balance-2251ms ± 4%255ms ± 3%~(p=0.190 n=10+10)
RuntimeTransaction/get_account_and_get_storage_used-237.1ms ± 5%37.8ms ± 8%~(p=0.436 n=10+10)
RuntimeTransaction/get_signer_vault-239.1ms ± 6%40.0ms ± 7%~(p=0.165 n=10+10)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-238.9ms ± 7%39.6ms ± 5%~(p=0.143 n=10+10)
RuntimeTransaction/load_and_save_long_string_on_signers_address-283.2ms ± 4%85.7ms ± 4%~(p=0.053 n=9+10)
RuntimeTransaction/create_new_account-2860ms ± 8%866ms ± 4%~(p=0.436 n=10+10)
RuntimeTransaction/call_empty_contract_function-234.5ms ± 8%35.1ms ± 8%~(p=0.579 n=10+10)
RuntimeTransaction/emit_event-248.4ms ± 7%49.2ms ± 6%~(p=0.280 n=10+10)
RuntimeTransaction/borrow_array_from_storage-2134ms ± 7%135ms ± 4%~(p=0.089 n=10+10)
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes-24.82s ± 6%4.90s ± 5%~(p=0.280 n=10+10)
 
alloc/opdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeNFTBatchTransfer-256.7MB ± 8%55.9MB ± 8%~(p=0.247 n=10+10)
RuntimeTransaction/reference_tx-234.9MB ± 3%34.9MB ± 4%~(p=0.853 n=10+10)
RuntimeTransaction/convert_int_to_string-235.2MB ± 4%35.1MB ± 4%~(p=0.278 n=10+9)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-235.6MB ± 4%35.8MB ± 4%~(p=0.684 n=10+10)
RuntimeTransaction/get_signer_address-235.5MB ± 5%35.3MB ± 3%~(p=0.853 n=10+10)
RuntimeTransaction/get_public_account-236.4MB ± 3%36.1MB ± 3%~(p=0.315 n=10+8)
RuntimeTransaction/get_account_and_get_balance-2129MB ± 3%129MB ± 2%~(p=0.796 n=10+10)
RuntimeTransaction/get_account_and_get_available_balance-2110MB ± 3%110MB ± 0%~(p=0.669 n=10+7)
RuntimeTransaction/get_account_and_get_storage_used-236.7MB ± 5%36.6MB ± 5%~(p=0.971 n=10+10)
RuntimeTransaction/get_account_and_get_storage_capacity-2105MB ± 3%105MB ± 2%~(p=0.912 n=10+10)
RuntimeTransaction/get_signer_vault-237.2MB ± 3%37.3MB ± 3%~(p=0.631 n=10+10)
RuntimeTransaction/get_signer_receiver-240.9MB ± 5%41.0MB ± 6%~(p=1.000 n=10+10)
RuntimeTransaction/transfer_tokens-282.4MB ± 6%83.8MB ± 6%~(p=0.280 n=10+10)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-236.0MB ± 4%36.1MB ± 2%~(p=0.968 n=10+9)
RuntimeTransaction/load_and_save_long_string_on_signers_address-255.6MB ± 6%55.6MB ± 8%~(p=0.853 n=10+10)
RuntimeTransaction/create_new_account-2196MB ± 1%198MB ± 2%~(p=0.280 n=10+10)
RuntimeTransaction/call_empty_contract_function-235.5MB ± 5%35.6MB ± 2%~(p=0.579 n=10+10)
RuntimeTransaction/emit_event-240.1MB ± 6%40.1MB ± 3%~(p=0.853 n=10+10)
RuntimeTransaction/borrow_array_from_storage-269.1MB ± 5%69.0MB ± 3%~(p=0.912 n=10+10)
RuntimeTransaction/copy_array_from_storage-281.5MB ± 1%81.4MB ± 4%~(p=0.813 n=7+10)
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes-21.28GB ± 1%1.28GB ± 1%~(p=0.912 n=10+10)
 
allocs/opdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeNFTBatchTransfer-2300k ± 1%300k ± 1%~(p=0.160 n=10+10)
RuntimeTransaction/reference_tx-289.6k ± 0%89.6k ± 0%~(p=0.780 n=10+10)
RuntimeTransaction/convert_int_to_string-2102k ± 0%102k ± 0%~(p=0.444 n=10+10)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-2113k ± 0%113k ± 0%~(p=0.494 n=10+9)
RuntimeTransaction/get_signer_address-293.8k ± 0%93.8k ± 0%~(p=0.324 n=10+8)
RuntimeTransaction/get_public_account-2115k ± 0%115k ± 0%~(p=0.986 n=10+10)
RuntimeTransaction/get_account_and_get_balance-21.51M ± 0%1.51M ± 0%~(p=0.755 n=10+10)
RuntimeTransaction/get_account_and_get_available_balance-21.35M ± 0%1.35M ± 0%~(p=0.681 n=8+10)
RuntimeTransaction/get_account_and_get_storage_used-2135k ± 0%135k ± 0%~(p=0.921 n=10+9)
RuntimeTransaction/get_account_and_get_storage_capacity-21.22M ± 0%1.22M ± 0%~(p=0.618 n=10+10)
RuntimeTransaction/get_signer_vault-2132k ± 0%132k ± 0%~(p=0.674 n=9+10)
RuntimeTransaction/get_signer_receiver-2204k ± 0%204k ± 0%~(p=0.954 n=10+10)
RuntimeTransaction/transfer_tokens-2860k ± 0%860k ± 0%~(p=0.138 n=10+10)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-2133k ± 0%133k ± 0%~(p=0.988 n=10+10)
RuntimeTransaction/load_and_save_long_string_on_signers_address-2234k ± 0%234k ± 0%~(p=0.361 n=10+10)
RuntimeTransaction/call_empty_contract_function-2104k ± 0%104k ± 0%~(p=0.489 n=10+10)
RuntimeTransaction/emit_event-2142k ± 0%142k ± 0%~(p=0.985 n=10+10)
RuntimeTransaction/borrow_array_from_storage-2346k ± 0%346k ± 0%~(p=0.920 n=9+10)
RuntimeTransaction/copy_array_from_storage-2303k ± 0%303k ± 0%~(p=0.137 n=10+10)
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes-219.8M ± 0%19.8M ± 0%~(p=0.529 n=10+10)
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/create_new_account-22.55M ± 0%2.55M ± 0%−0.00%(p=0.011 n=7+9)
 
computationdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/reference_tx-2202 ± 0%202 ± 0%~(all equal)
RuntimeTransaction/convert_int_to_string-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-2502 ± 0%502 ± 0%~(all equal)
RuntimeTransaction/get_signer_address-2302 ± 0%302 ± 0%~(all equal)
RuntimeTransaction/get_public_account-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_balance-21.00k ± 0%1.00k ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_available_balance-22.60k ± 0%2.60k ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_storage_used-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_storage_capacity-21.30k ± 0%1.30k ± 0%~(all equal)
RuntimeTransaction/get_signer_vault-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/get_signer_receiver-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/transfer_tokens-23.50k ± 0%3.50k ± 0%~(all equal)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/load_and_save_long_string_on_signers_address-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/create_new_account-2202 ± 0%202 ± 0%~(all equal)
RuntimeTransaction/call_empty_contract_function-2402 ± 0%402 ± 0%~(all equal)
RuntimeTransaction/emit_event-2602 ± 0%602 ± 0%~(all equal)
RuntimeTransaction/borrow_array_from_storage-22.60k ± 0%2.60k ± 0%~(all equal)
RuntimeTransaction/copy_array_from_storage-22.60k ± 0%2.60k ± 0%~(all equal)
 
interactionsdelta
pkg:github.com/onflow/flow-go/fvm goos:linux goarch:amd64
RuntimeTransaction/reference_tx-244.3k ± 0%44.3k ± 0%~(all equal)
RuntimeTransaction/convert_int_to_string-244.3k ± 0%44.3k ± 0%~(all equal)
RuntimeTransaction/convert_int_to_string_and_concatenate_it-244.3k ± 0%44.3k ± 0%~(all equal)
RuntimeTransaction/get_signer_address-244.3k ± 0%44.3k ± 0%~(all equal)
RuntimeTransaction/get_public_account-244.3k ± 0%44.3k ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_balance-216.7M ± 0%16.7M ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_available_balance-25.13M ± 0%5.13M ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_storage_used-244.3k ± 0%44.3k ± 0%~(all equal)
RuntimeTransaction/get_account_and_get_storage_capacity-25.13M ± 0%5.13M ± 0%~(all equal)
RuntimeTransaction/get_signer_vault-244.5k ± 0%44.5k ± 0%~(all equal)
RuntimeTransaction/get_signer_receiver-244.9k ± 0%44.9k ± 0%~(all equal)
RuntimeTransaction/transfer_tokens-245.2k ± 0%45.2k ± 0%~(all equal)
RuntimeTransaction/load_and_save_empty_string_on_signers_address-244.4k ± 0%44.4k ± 0%~(all equal)
RuntimeTransaction/load_and_save_long_string_on_signers_address-247.2k ± 0%47.2k ± 0%~(all equal)
RuntimeTransaction/create_new_account-28.39M ± 0%8.39M ± 0%~(all equal)
RuntimeTransaction/call_empty_contract_function-244.5k ± 0%44.5k ± 0%~(all equal)
RuntimeTransaction/emit_event-244.5k ± 0%44.5k ± 0%~(all equal)
RuntimeTransaction/borrow_array_from_storage-249.7k ± 0%49.7k ± 0%~(all equal)
RuntimeTransaction/copy_array_from_storage-249.7k ± 0%49.7k ± 0%~(all equal)
 
us/txdelta
pkg:github.com/onflow/flow-go/engine/execution/computation goos:linux goarch:amd64
ComputeBlock/16/cols/128/txes-22.35k ± 6%2.39k ± 5%~(p=0.255 n=10+10)
 

@SaveTheRbtz
Copy link
Contributor Author

bors merge

bors bot added a commit that referenced this pull request Nov 9, 2022
@bors @SaveTheRbtz
Merge #3522
6c3cdcf 
3522: [Execution] Minor ingestion logging cleanup r=SaveTheRbtz a=SaveTheRbtz

Use proper logger.

Co-authored-by: Alexey Ivanov <rbtz@dapperlabs.com>
@bors
Copy link
Contributor

bors bot commented Nov 9, 2022

Build failed:

  • Integration Tests (make -C integration epochs-tests)

@SaveTheRbtz
Copy link
Contributor Author

bors merge

@bors
Copy link
Contributor

bors bot commented Nov 9, 2022

Build succeeded:

@bors bors bot merged commit 849c0c5 into master Nov 9, 2022
@bors bors bot deleted the rbtz/minorCleanup1 branch November 9, 2022 18:41
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhangchiqing zhangchiqing zhangchiqing approved these changes

@pattyshack pattyshack pattyshack approved these changes

@jordanschalm jordanschalm jordanschalm approved these changes

@m4ksio m4ksio Awaiting requested review from m4ksio

@ramtinms ramtinms Awaiting requested review from ramtinms ramtinms is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SaveTheRbtz @codecov-commenter @zhangchiqing @pattyshack @jordanschalm