fix(collator): fix readers state reset after refill

* reset `all_ranges_fully_read` flag, otherwise we skip the reading step when collecting first message group after refill
broxus · Feb 23, 2025 · 9467b40 · 9467b40
1 parent ca1a395
commit 9467b40
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/collator/src/collator/messages_reader/externals_reader.rs b/collator/src/collator/messages_reader/externals_reader.rs
@@ -79,6 +79,10 @@ impl ExternalsReader {
         reader
     }
 
+    pub(super) fn reset_read_state(&mut self) {
+        self.all_ranges_fully_read = false;
+    }
+
     pub fn finalize(mut self) -> Result<FinalizedExternalsReader> {
         // collect range reader states
         let mut range_readers = self.range_readers.into_iter().peekable();

diff --git a/collator/src/collator/messages_reader/internals_reader.rs b/collator/src/collator/messages_reader/internals_reader.rs
@@ -88,6 +88,10 @@ impl<V: InternalMessageValue> InternalsPartitionReader<V> {
         Ok(reader)
     }
 
+    pub(super) fn reset_read_state(&mut self) {
+        self.all_ranges_fully_read = false;
+    }
+
     pub(super) fn drop_next_range_reader(&mut self) {
         self.range_readers
             .retain(|_, r| r.kind != InternalsRangeReaderKind::Next);

diff --git a/collator/src/collator/messages_reader/mod.rs b/collator/src/collator/messages_reader/mod.rs
@@ -319,6 +319,14 @@ impl<V: InternalMessageValue> MessagesReader<V> {
             *par_reader_stage = initial_reader_stage;
         }
 
+        // reset internals readers
+        for (_, par) in self.internals_partition_readers.iter_mut() {
+            par.reset_read_state();
+        }
+
+        // reset externals reader
+        self.externals_reader.reset_read_state();
+
         tracing::debug!(target: tracing_targets::COLLATOR,
             readers_stages = ?self.readers_stages,
             externals_all_ranges_read_and_collected = self.externals_reader.all_ranges_read_and_collected(),