Fixed an edge case where a shard that hasn't yet received cluster topology could reject internal queries with 'Query requires unavailable slots' during the first moments after server startup - [MOD-13828] (#8388)

GuyAv46 · web-flow · commit 7365bbd90fbe · 2026-02-16T13:31:11.000Z
* initialize SlotsTracker with all slots

* fix default implementation
diff --git a/src/redisearch_rs/c_entrypoint/slots_tracker_ffi/src/lib.rs b/src/redisearch_rs/c_entrypoint/slots_tracker_ffi/src/lib.rs
@@ -72,7 +72,7 @@ static OWNER_THREAD: OnceLock<ThreadId> = OnceLock::new();
 //
 // Only accessible from the thread that first calls any FFI function.
 thread_local! {
-    static TRACKER: RefCell<SlotsTracker> = const { RefCell::new(SlotsTracker::new()) };
+    static TRACKER: RefCell<SlotsTracker> = RefCell::new(SlotsTracker::new());
 }
 
 // ============================================================================
diff --git a/src/redisearch_rs/slots_tracker/src/slots_tracker.rs b/src/redisearch_rs/slots_tracker/src/slots_tracker.rs
@@ -77,7 +77,7 @@ impl Version {
 ///
 /// This structure encapsulates all slot tracking state and provides safe methods
 /// for manipulating the three slot sets and version counter.
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SlotsTracker {
     /// Local responsibility slots - owned by this Redis instance in the cluster topology.
     local: SlotSet,
@@ -93,11 +93,20 @@ pub struct SlotsTracker {
     version: Version,
 }
 
+impl Default for SlotsTracker {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl SlotsTracker {
-    /// Creates a new SlotsTracker with empty slot sets and version 1.
-    pub const fn new() -> Self {
+    /// Creates a new SlotsTracker with full local slot set, empty fully and partially available sets, and version 1.
+    pub fn new() -> Self {
         Self {
-            local: SlotSet::new(),
+            local: SlotSet::from_ranges(&[SlotRange {
+                start: 0,
+                end: 16383,
+            }]),
             fully_available: SlotSet::new(),
             partially_available: SlotSet::new(),
             version: Version::new(),
@@ -547,11 +556,15 @@ mod tests {
     #[test]
     fn test_remove_deleted_slots_only_affects_partially_available() {
         let mut tracker = SlotsTracker::new();
+        // Simulate a shard configured with no local slots (import scenario)
+        tracker.set_local_slots(&[]);
+        let v_after_set = tracker.get_version();
         tracker.mark_partially_available_slots(&[SlotRange {
             start: 200,
             end: 210,
         }]);
         let v1 = tracker.get_version();
+        assert_eq!(v1, v_after_set.increment());
         assert_eq!(tracker, ([], [], [(200, 210)], Some(v1)));
         tracker.remove_deleted_slots(&[SlotRange {
             start: 205,
@@ -572,7 +585,15 @@ mod tests {
         let mut tracker = SlotsTracker::new();
         let initial_version = tracker.get_version();
         assert_eq!(tracker.get_version(), Version::new());
-        assert!(tracker.local.is_empty());
+        // New tracker starts with full slot range (no topology yet)
+        assert_eq!(
+            tracker.local,
+            [SlotRange {
+                start: 0,
+                end: 16383
+            }]
+            .as_slice()
+        );
         assert!(tracker.fully_available.is_empty());
         assert!(tracker.partially_available.is_empty());
 
@@ -690,6 +711,8 @@ mod tests {
     #[test]
     fn test_promote_to_local_slots_does_not_increment_version() {
         let mut tracker = SlotsTracker::new();
+        // Simulate a shard configured with no local slots (import scenario)
+        tracker.set_local_slots(&[]);
         tracker.mark_partially_available_slots(&[SlotRange {
             start: 100,
             end: 200,
@@ -765,6 +788,8 @@ mod tests {
     #[test]
     fn test_promote_to_local_slots_empty_ranges() {
         let mut tracker = SlotsTracker::new();
+        // Simulate a shard configured with no local slots (import scenario)
+        tracker.set_local_slots(&[]);
         tracker.mark_partially_available_slots(&[SlotRange {
             start: 100,
             end: 200,
@@ -779,6 +804,8 @@ mod tests {
     #[test]
     fn test_promote_to_local_slots_multiple_ranges() {
         let mut tracker = SlotsTracker::new();
+        // Simulate a shard configured with no local slots (import scenario)
+        tracker.set_local_slots(&[]);
         tracker.mark_partially_available_slots(&[SlotRange {
             start: 100,
             end: 200,

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ static OWNER_THREAD: OnceLock<ThreadId> = OnceLock::new();`
`72`	`72`	`//`
`73`	`73`	`// Only accessible from the thread that first calls any FFI function.`
`74`	`74`	`thread_local! {`
`75`		`- static TRACKER: RefCell<SlotsTracker> = const { RefCell::new(SlotsTracker::new()) };`
	`75`	`+ static TRACKER: RefCell<SlotsTracker> = RefCell::new(SlotsTracker::new());`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// ============================================================================`