Switch consensus to a runtime configuration #565
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
agourlay
force-pushed
the
runtime-configuration-consensus
branch
from
0b20e9d to
5b07a9a
Compare
agourlay
force-pushed
the
runtime-configuration-consensus
branch
from
5b07a9a to
1fb720c
Compare
agourlay
commented
May 5, 2022
| @@ -51,7 +51,7 @@ jobs: | |||
| run: .github/scripts/protoc.sh | |||
| shell: bash | |||
| - name: Build | |||
| run: cargo build --features consensus | |||
There was a problem hiding this comment.
Given that the binaries are now equivalent, we could also just move ./tests/integration-tests.sh distributed as an additional step to the previous job to not compile twice.
agourlay
commented
May 5, 2022
src/main.rs
Outdated
| runtime_handle.block_on(async { | ||
| for collection in toc.all_collections().await { | ||
| log::info!("Loaded collection: {}", collection); | ||
| } | ||
| }); | ||
|
|
||
| #[cfg(feature = "consensus")] | ||
| let (propose_sender, propose_receiver) = std::sync::mpsc::channel(); |
There was a problem hiding this comment.
the channel and the propose_sender are always initialized regardless of the configuration,
agourlay
changed the title
agourlay
commented
May 5, 2022
| @@ -355,21 +337,17 @@ impl TableOfContent { | |||
| operation: CollectionMetaOperations, | |||
| wait_timeout: Option<Duration>, | |||
| ) -> Result<bool, StorageError> { | |||
| #[cfg(feature = "consensus")] | |||
| { | |||
| if self.distributed_mode { | |||
There was a problem hiding this comment.
this is where the rubber meets the road
agourlay
commented
May 5, 2022
| @@ -30,25 +30,6 @@ jobs: | |||
| - name: Run tests | |||
| run: cargo test --all | |||
|
|
|||
| test-consensus: | |||
There was a problem hiding this comment.
removed because the consensus unit tests are now executed by default
agourlay
commented
May 5, 2022
| @@ -129,7 +116,7 @@ impl TableOfContent { | |||
| Wal::open(collections_meta_wal_path).unwrap(), | |||
| )) | |||
| }; | |||
| #[cfg(feature = "consensus")] | |||
|
|
|||
There was a problem hiding this comment.
the raft state is now always initialized, not sure if it could be problematic TBH
There was a problem hiding this comment.
It's a small file, shouldn't really matter to user I think
e-ivkov
reviewed
May 6, 2022
e-ivkov
approved these changes
May 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR switch the consensus from a conditional compilation cargo feature to a runtime configuration #511
This means:
cluster.enabledconfiguration field (false by default)tocis aware of the distribution mode