Modify ShardTableEntry to differentiate between local shard and remot… #3935
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
|
You can run |
guilload
reviewed
Oct 12, 2023
| @@ -37,40 +39,55 @@ impl ShardTableEntry { | |||
| /// # Panics | |||
| /// | |||
| /// Panics if `shards` is empty after filtering out closed shards and deduplicating by shard ID. | |||
| pub fn new(mut shards: Vec<Shard>) -> Self { | |||
| pub fn new(mut shards: Vec<Shard>, node_id: String) -> Self { | |||
There was a problem hiding this comment.
Suggested change
| pub fn new(mut shards: Vec<Shard>, node_id: String) -> Self { | |
| pub fn new(mut shards: Vec<Shard>, node_id: &NodeId) -> Self { |
| } | ||
| } | ||
|
|
||
| /// Returns the next shard in round-robin order. | ||
| pub fn next_shard_round_robin(&self) -> &Shard { | ||
| let shard_idx = self.round_robin_idx.fetch_add(1, Ordering::Relaxed); | ||
| &self.shards[shard_idx % self.shards.len()] | ||
| if self.local_shards.len() > 0 { |
There was a problem hiding this comment.
Suggested change
| if self.local_shards.len() > 0 { | |
| if !self.local_shards.is_empty() { |
| @@ -99,7 +116,7 @@ impl ShardTable { | |||
| shards: Vec<Shard>, | |||
| ) { | |||
| let key = (index_id.into(), source_id.into()); | |||
| self.table.insert(key, ShardTableEntry::new(shards)); | |||
| self.table.insert(key, ShardTableEntry::new(shards, self.self_node_id.to_string())); | |||
There was a problem hiding this comment.
Suggested change
| self.table.insert(key, ShardTableEntry::new(shards, self.self_node_id.to_string())); | |
| self.table.insert(key, ShardTableEntry::new(shards, &self.self_node_id)); |
quickwit/quickwit-proto/src/types.rs
Outdated
| @@ -171,6 +171,12 @@ impl Borrow<NodeIdRef> for NodeId { | |||
| } | |||
| } | |||
|
|
|||
| impl Default for NodeId { | |||
There was a problem hiding this comment.
Let's remove Default on ShardTableEntry instead.
There was a problem hiding this comment.
We need the default on NodeID because of the default trait used for ShardTable. Is that what you want to remove?
guilload
approved these changes
Oct 12, 2023
|
Thanks @kamalesh0406! |
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.
…e shards
Description
This change adds the ability for the ShardTableEntry to pick local shards (shards that share the same leader id) when available. If local shards are unavailable, we pick remote shards. This PR was made for issue #3922.
How was this PR tested?
Add unit tests for shard-table. The unit tests for router.rs are failing, I want to confirm if the logic I have written is correct to fix them.