This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Refactor unapplied transaction queue #7453

Merged

heifner merged 41 commits into develop from refactor-unapplied-develop

Jul 16, 2019

Contributor

heifner commented Jun 3, 2019 •

edited

Loading

Change Description

Before unapplied transactions from forked blocks, aborted blocks, and subjectively failed (out of time in block) transactions were tracked in controller and in the producer_plugin.
This design made it difficult to correctly track transactions as they were applied and unapplied.
Created an unapplied_transactions_queue for efficiently tracking these transactions.
-- The unapplied_transactions_queue manages the order these transactions are re-applied via a FIFO queue.
The controller is no longer responsible for tracking these transactions as it is the producer_plugin responsibility to track them via the unapplied_transactions_queue.

Consensus Changes

Consensus Changes

API Changes

API Changes

Documentation Additions

Documentation Additions

heifner added 13 commits

May 31, 2019 12:29


          Modify push_block to return unapplied blocks from fork switch

3a1edc0


          Modify abort_block to return transactions applied in the aborted block

6b280a2


          Modify test to call produce_block twice instead of produce_block with…

8a3f30b

… a skip time which has the side effect of aborting block.


          Remove get_unapplied_transactions as it is now the callers of abort_b…

ca53406

…lock() and push_block() reposibility to track transactions to apply in new blocks


          Remove get_unapplied_transactions as it is now the callers of abort_b…

fdf4180

…lock() and push_block() reposibility to track transactions to apply in new blocks


          Add abort block test to verify return of abort_block

34ab300


          Remove return of block from push_block since not used.

38708b8


          Modify tester push_block to return forked/dropped transactions

0aeb651


          Add test for push_block returning forked transactions

1bf825b


          Add unapplied_transation_queue to effeciently track unapplied transac…

6277c42

…tions


          Added clear()

3ab054f


          Add empty() method

9d1ccbc


          Integrate unapplicated_transactions_queue

8a0fb6b

heifner requested a review from arhag

June 4, 2019 14:38

arhag suggested changes

View reviewed changes

libraries/chain/controller.cpp Outdated Show resolved Hide resolved

libraries/testing/tester.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp Outdated Show resolved Hide resolved

plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp Outdated Show resolved Hide resolved

libraries/testing/tester.cpp Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

heifner added 4 commits

June 12, 2019 15:24


          Remove const so move actually moves

3f2097f


          Add aborted after forked transactions to queue

b02a023


          Change order to forked, aborted, subjective failed

3b8ba53


          Add total size tracking

8e196a4

Contributor

NorseGaud commented Jun 13, 2019

Should work with a merge from develop. That'll pick up the new changes for the CICD to work.

heifner added 9 commits

June 13, 2019 07:18


          Merge branch 'develop' into refactor-unapplied-develop

03d0438


          Move unapplied_transaction_queue to eosio chain library

181e654


          Add trxs to queue in order they will be processed


          Simplify abort_block addition to queue

c084b44


          Init total_size

e0bb088


          Add unapplied_transaction_queue to tester

c20b862


          Add back applied transaction processing

20247ae


          Restore debug log message with applied transactions total included

4002c12


          tester now reapplies aborted trxs

466612e

arhag suggested changes

View reviewed changes

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

libraries/testing/tester.cpp Outdated Show resolved Hide resolved

libraries/testing/tester.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

heifner added 2 commits

June 13, 2019 18:17


          Apply scheduled first to match original code

1b011d0


          Minor peer review fixes

61d9ac6

arhag suggested changes

View reviewed changes

plugins/producer_plugin/producer_plugin.cpp Show resolved Hide resolved

heifner added 7 commits

June 21, 2019 15:28


          Modified to use boost multiindex

8d5da76


          Remove add_subjective_failure, add add_persisted

2771dd0


          Use iterator

34c4023


          Use iterator

c6611b9


          Remove signed_id as id is already unique

af4dd6d


          Use unapplied_transaction_queue iterator

204fd00


          Update comment

e0bea30

arhag suggested changes

View reviewed changes

libraries/chain/include/eosio/chain/transaction_metadata.hpp Show resolved Hide resolved

libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp Outdated Show resolved Hide resolved

libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp Outdated Show resolved Hide resolved

libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp Outdated Show resolved Hide resolved

libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

plugins/producer_plugin/producer_plugin.cpp Outdated Show resolved Hide resolved

heifner added 6 commits

July 16, 2019 10:26


          Merge branch 'develop' into refactor-unapplied-develop

a88063d


          Remove unneeded signed_id

5b3504c


          Code cleanup

54002df


          sequenced not needed as fifo is documented behavior and we have tests…

9537c5a

… to verify


          Add only_track_persisted feature

c27f0e1


          Simplify logic by using only_track_persisted flag

1aa6039

heifner requested a review from arhag

July 16, 2019 19:50

arhag approved these changes

View reviewed changes

heifner merged commit e549a6c into develop

heifner deleted the refactor-unapplied-develop branch

July 16, 2019 21:27

heifner mentioned this pull request

Unapplied transaction queue performance #7686

Merged

3 tasks

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet