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

Update gas metering #8526

Merged
merged 15 commits into from
Jun 6, 2023
Merged

Update gas metering #8526

merged 15 commits into from
Jun 6, 2023

Conversation

movekevin
Copy link
Contributor

Description

Reopening #8474

Test Plan

@movekevin movekevin requested a review from gerben-stavenga June 5, 2023 17:41
@movekevin movekevin added the CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR label Jun 5, 2023
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
gerben-stavenga
gerben-stavenga reviewed Jun 5, 2023
View reviewed changes
aptos-move/aptos-vm/src/data_cache.rs Outdated
resource_group_cache: RefCell::new(BTreeMap::new()),
}
};
s.accurate_byte_count = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So is this just for testing purposes?

@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@gerben-stavenga gerben-stavenga enabled auto-merge (squash) June 5, 2023 22:16
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions
Copy link
Contributor

github-actions bot commented Jun 5, 2023

✅ Forge suite compat success on testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> fc6bbe46284e43a9c4c100ac42e23326977226bf

Compatibility test results for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> fc6bbe46284e43a9c4c100ac42e23326977226bf (PR)
1. Check liveness of validators at old version: testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b
compatibility::simple-validator-upgrade::liveness-check : 9755 TPS, 3856 ms latency, 6200 ms p99 latency,no expired txns
2. Upgrading first Validator to new version: fc6bbe46284e43a9c4c100ac42e23326977226bf
compatibility::simple-validator-upgrade::single-validator-upgrade : 5885 TPS, 6857 ms latency, 10200 ms p99 latency,no expired txns
3. Upgrading rest of first batch to new version: fc6bbe46284e43a9c4c100ac42e23326977226bf
compatibility::simple-validator-upgrade::half-validator-upgrade : 3916 TPS, 10198 ms latency, 16400 ms p99 latency,no expired txns
4. upgrading second batch to new version: fc6bbe46284e43a9c4c100ac42e23326977226bf
compatibility::simple-validator-upgrade::rest-validator-upgrade : 6259 TPS, 6019 ms latency, 12100 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> fc6bbe46284e43a9c4c100ac42e23326977226bf passed
Test Ok

@github-actions
Copy link
Contributor

github-actions bot commented Jun 5, 2023

✅ Forge suite land_blocking success on fc6bbe46284e43a9c4c100ac42e23326977226bf

performance benchmark : 5609 TPS, 7023 ms latency, 27700 ms p99 latency,(!) expired 220 out of 2395300 txns
Test Ok

@github-actions
Copy link
Contributor

github-actions bot commented Jun 5, 2023

✅ Forge suite framework_upgrade success on aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> fc6bbe46284e43a9c4c100ac42e23326977226bf

Compatibility test results for aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> fc6bbe46284e43a9c4c100ac42e23326977226bf (PR)
Upgrade the nodes to version: fc6bbe46284e43a9c4c100ac42e23326977226bf
framework_upgrade::framework-upgrade::full-framework-upgrade : 5958 TPS, 6747 ms latency, 20100 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> fc6bbe46284e43a9c4c100ac42e23326977226bf passed
Test Ok

@gerben-stavenga gerben-stavenga self-requested a review June 5, 2023 23:27
@gerben-stavenga gerben-stavenga merged commit 09359aa into main Jun 6, 2023
@gerben-stavenga gerben-stavenga deleted the gerben-cache-2 branch June 6, 2023 00:00
sherry-x pushed a commit to sherry-x/aptos-core that referenced this pull request Jun 6, 2023
@movekevin @gerben-stavenga
@geekflyer @sherry-x
Update gas metering (aptos-labs#8526)
1c48dac 
* Add accurate resource group gas metering

* Add accurate resource group gas metering

* fix

* add test

* Correct feature version

* change trait signature

* Clear any resource cache after proloque

* bump gas feature

* add comment

* fix trigger condition for build jobs

* test loadtest

* add improvement

* Fix respawn session whatever that maybe

---------

Co-authored-by: gerben <stavenga@gmail.com>
Co-authored-by: geekflyer <christian@aptoslabs.com>
sherry-x pushed a commit to sherry-x/aptos-core that referenced this pull request Jun 6, 2023
@movekevin @gerben-stavenga
@geekflyer @sherry-x
Update gas metering (aptos-labs#8526)
45475ef 
* Add accurate resource group gas metering

* Add accurate resource group gas metering

* fix

* add test

* Correct feature version

* change trait signature

* Clear any resource cache after proloque

* bump gas feature

* add comment

* fix trigger condition for build jobs

* test loadtest

* add improvement

* Fix respawn session whatever that maybe

---------

Co-authored-by: gerben <stavenga@gmail.com>
Co-authored-by: geekflyer <christian@aptoslabs.com>
sherry-x pushed a commit to sherry-x/aptos-core that referenced this pull request Jun 6, 2023
@movekevin @gerben-stavenga
@geekflyer @sherry-x
Update gas metering (aptos-labs#8526)
788c463 
* Add accurate resource group gas metering

* Add accurate resource group gas metering

* fix

* add test

* Correct feature version

* change trait signature

* Clear any resource cache after proloque

* bump gas feature

* add comment

* fix trigger condition for build jobs

* test loadtest

* add improvement

* Fix respawn session whatever that maybe

---------

Co-authored-by: gerben <stavenga@gmail.com>
Co-authored-by: geekflyer <christian@aptoslabs.com>
gedigi pushed a commit that referenced this pull request Jun 6, 2023
@movekevin @gerben-stavenga
@geekflyer @gedigi
Update gas metering (#8526)
c0740f1 
* Add accurate resource group gas metering

* Add accurate resource group gas metering

* fix

* add test

* Correct feature version

* change trait signature

* Clear any resource cache after proloque

* bump gas feature

* add comment

* fix trigger condition for build jobs

* test loadtest

* add improvement

* Fix respawn session whatever that maybe

---------

Co-authored-by: gerben <stavenga@gmail.com>
Co-authored-by: geekflyer <christian@aptoslabs.com>
sherry-x added a commit that referenced this pull request Jun 7, 2023
@sherry-x @movekevin
@gerben-stavenga @geekflyer
Update gas metering (#8526) (#8533)
951bd31 
* Add accurate resource group gas metering

* Add accurate resource group gas metering

* fix

* add test

* Correct feature version

* change trait signature

* Clear any resource cache after proloque

* bump gas feature

* add comment

* fix trigger condition for build jobs

* test loadtest

* add improvement

* Fix respawn session whatever that maybe

---------

Co-authored-by: Kevin <105028215+movekevin@users.noreply.github.com>
Co-authored-by: gerben <stavenga@gmail.com>
Co-authored-by: geekflyer <christian@aptoslabs.com>
@perryjrandall perryjrandall mentioned this pull request Jun 16, 2023
Closed
@qdrs qdrs mentioned this pull request Jun 20, 2023
Closed
banool pushed a commit that referenced this pull request Jul 7, 2023
@movekevin @gerben-stavenga
@geekflyer @banool
Update gas metering (#8526)
65dbfae 
* Add accurate resource group gas metering

* Add accurate resource group gas metering

* fix

* add test

* Correct feature version

* change trait signature

* Clear any resource cache after proloque

* bump gas feature

* add comment

* fix trigger condition for build jobs

* test loadtest

* add improvement

* Fix respawn session whatever that maybe

---------

Co-authored-by: gerben <stavenga@gmail.com>
Co-authored-by: geekflyer <christian@aptoslabs.com>
@perryjrandall perryjrandall mentioned this pull request Jul 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sherry-x sherry-x sherry-x approved these changes

@gerben-stavenga gerben-stavenga gerben-stavenga approved these changes

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

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

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

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

Assignees
No one assigned
Labels
CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@movekevin @gerben-stavenga @sherry-x @geekflyer