This repository has been archived by the owner on Apr 17, 2019. It is now read-only.
Ordering Service Batch Support #1586
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
nickaleks
reviewed
Jul 23, 2018
| log_->info("Queue size is {}", queue_.unsafe_size()); | ||
| void OrderingServiceImpl::onBatch( | ||
| shared_model::interface::TransactionBatch &&batch) { | ||
| current_size_.fetch_add(batch.transactions().size()); |
There was a problem hiding this comment.
Race condition related to several concurrent batches
Signed-off-by: Akvinikym <[email protected]>
Signed-off-by: Akvinikym <[email protected]>
kamilsa
previously requested changes
Jul 25, 2018
| batch->transactions().end(), | ||
| [this, &proto_proposal](auto &tx) { | ||
| *proto_proposal.add_transactions() = | ||
| static_cast<shared_model::proto::Transaction *>(tx.get()) |
Signed-off-by: Akvinikym <[email protected]>
nickaleks
previously requested changes
Jul 25, 2018
| #include <rxcpp/rx.hpp> | ||
| #include <shared_mutex> |
There was a problem hiding this comment.
Please reorganize includes as follows:
- std includes
- third party
- ours
| @@ -157,7 +143,8 @@ TEST_F(OrderingServiceTest, ValidWhenProposalSizeStrategy) { | |||
| fake_transport->subscribe(ordering_service); | |||
|
|
|||
| for (size_t i = 0; i < tx_num; ++i) { | |||
| ordering_service->onTransaction(getTx()); | |||
| auto batch = framework::batch::createValidBatch(1); | |||
There was a problem hiding this comment.
if you add "namespace framework" you can make it one liner
| .WillRepeatedly(Return(true)); | ||
| EXPECT_CALL(*fake_persistent_state, loadProposalHeight()) | ||
| .Times(1) | ||
| .WillOnce(Return(boost::optional<size_t>(15))); |
There was a problem hiding this comment.
please make 15 a constant. Even better is to replace with expession (batch1.size + batch2.size)
Signed-off-by: Akvinikym <[email protected]>
nickaleks
approved these changes
Jul 25, 2018
| log_->info("Queue size is {}", queue_.unsafe_size()); | ||
| void OrderingServiceImpl::onBatch( | ||
| shared_model::interface::TransactionBatch &&batch) { | ||
| std::shared_lock<std::shared_timed_mutex> batch_prop_lock( |
There was a problem hiding this comment.
Please add comments about why this mutex is necessary
kamilsa
approved these changes
Jul 25, 2018
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
l4l
pushed a commit
that referenced
this pull request
Jul 25, 2018
Signed-off-by: Akvinikym <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the Change
In this pull request support for transaction batches in ordering service was added, which ends the batch pipeline, as after it they go into proposal. Also, one can pay attention that ordering service now accepts only batches, no single transactions anymore (except those which are wrapped into batches).
Benefits
Ends batch pipeline.
Possible Drawbacks
None