vsr: reset sync_view when sync is done

tigerbeetle · Mar 15, 2024 · 84bc115 · 84bc115
1 parent de8f1e5
commit 84bc115
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/vsr/replica.zig b/src/vsr/replica.zig
@@ -3819,16 +3819,17 @@ pub fn ReplicaType(
             // Thus, the SuperBlock's `commit_min` is set to 7-2=5.
             const vsr_state_commit_min = self.op_checkpoint_next();
 
-            const vsr_state_sync_op: struct { min: u64, max: u64 } = sync: {
+            const vsr_state_sync: struct { op_min: u64, op_max: u64, view: u32 } = sync: {
                 if (self.sync_content_done()) {
                     assert(self.sync_tables == null);
                     assert(self.grid_repair_tables.executing() == 0);
 
-                    break :sync .{ .min = 0, .max = 0 };
+                    break :sync .{ .op_min = 0, .op_max = 0, .view = 0 };
                 } else {
                     break :sync .{
-                        .min = self.superblock.staging.vsr_state.sync_op_min,
-                        .max = self.superblock.staging.vsr_state.sync_op_max,
+                        .op_min = self.superblock.staging.vsr_state.sync_op_min,
+                        .op_max = self.superblock.staging.vsr_state.sync_op_max,
+                        .view = self.superblock.staging.vsr_state.view,
                     };
                 }
             };
@@ -3852,8 +3853,9 @@ pub fn ReplicaType(
                 .{
                     .header = self.journal.header_with_op(vsr_state_commit_min).?.*,
                     .commit_max = self.commit_max,
-                    .sync_op_min = vsr_state_sync_op.min,
-                    .sync_op_max = vsr_state_sync_op.max,
+                    .sync_op_min = vsr_state_sync.op_min,
+                    .sync_op_max = vsr_state_sync.op_max,
+                    .sync_view = vsr_state_sync.view,
                     .manifest_references = self.state_machine.forest.manifest_log.checkpoint_references(),
                     .free_set_reference = self.grid.free_set_checkpoint.checkpoint_reference(),
                     .client_sessions_reference = self.client_sessions_checkpoint.checkpoint_reference(),

diff --git a/src/vsr/superblock.zig b/src/vsr/superblock.zig
@@ -199,6 +199,7 @@ pub const SuperBlockHeader = extern struct {
         pub fn assert_internally_consistent(state: VSRState) void {
             assert(state.commit_max >= state.checkpoint.header.op);
             assert(state.sync_op_max >= state.sync_op_min);
+            if (state.sync_op_max == 0) assert(state.sync_view == 0);
             assert(state.view >= state.log_view);
             assert(state.replica_count > 0);
             assert(state.replica_count <= constants.replicas_max);
@@ -813,6 +814,7 @@ pub fn SuperBlockType(comptime Storage: type) type {
             commit_max: u64,
             sync_op_min: u64,
             sync_op_max: u64,
+            sync_view: u32,
             manifest_references: ManifestReferences,
             free_set_reference: TrailerReference,
             client_sessions_reference: TrailerReference,
@@ -871,6 +873,7 @@ pub fn SuperBlockType(comptime Storage: type) type {
             vsr_state.commit_max = update.commit_max;
             vsr_state.sync_op_min = update.sync_op_min;
             vsr_state.sync_op_max = update.sync_op_max;
+            vsr_state.sync_view = update.sync_view;
             assert(superblock.staging.vsr_state.would_be_updated_by(vsr_state));
 
             context.* = .{