Skip to content

Commit

Permalink
VSR: Rename Reply.parent to request_checksum
Browse files Browse the repository at this point in the history
  • Loading branch information
sentientwaffle committed Feb 7, 2024
1 parent 57ff7d0 commit 2561700
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/vsr/client.zig
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ pub fn Client(comptime StateMachine_: type, comptime MessageBus: type) type {
});
return;
}
assert(reply.header.parent == inflight.message.header.checksum);
assert(reply.header.request_checksum == inflight.message.header.checksum);
} else {
log.debug("{}: on_reply: ignoring (no inflight request)", .{self.id});
return;
Expand Down Expand Up @@ -619,7 +619,7 @@ pub fn Client(comptime StateMachine_: type, comptime MessageBus: type) type {
reply.header.operation.tag_name(StateMachine),
});

assert(reply.header.parent == self.parent);
assert(reply.header.request_checksum == self.parent);
assert(reply.header.client == self.id);
assert(reply.header.request == inflight_request);
assert(reply.header.cluster == self.cluster);
Expand Down Expand Up @@ -1043,7 +1043,7 @@ test "Client Batching" {
.view = message.header.view,
.command = .reply,
.replica = message.header.replica,
.parent = message.header.checksum,
.request_checksum = message.header.checksum,
.client = message.header.client,
.context = undefined, // computed below.
.op = bus.commit,
Expand Down
6 changes: 3 additions & 3 deletions src/vsr/message_header.zig
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,8 @@ pub const Header = extern struct {
reserved_frame: [16]u8 = [_]u8{0} ** 16,

/// The checksum of the corresponding Request.
parent: u128,
parent_padding: u128 = 0,
request_checksum: u128,
request_checksum_padding: u128 = 0,
/// The checksum of the prepare message to which this message refers.
/// This allows for cryptographic guarantees beyond request, op, and commit numbers, which
/// have low entropy and may otherwise collide in the event of any correctness bugs.
Expand All @@ -760,7 +760,7 @@ pub const Header = extern struct {
assert(self.command == .reply);
// Initialization within `client.zig` asserts that client `id` is greater than zero:
if (self.client == 0) return "client == 0";
if (self.parent_padding != 0) return "parent_padding != 0";
if (self.request_checksum_padding != 0) return "request_checksum_padding != 0";
if (self.context_padding != 0) return "context_padding != 0";
if (self.op != self.commit) return "op != commit";
if (self.timestamp == 0) return "timestamp == 0";
Expand Down
6 changes: 3 additions & 3 deletions src/vsr/replica.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3791,7 +3791,7 @@ pub fn ReplicaType(
reply.header.* = .{
.command = .reply,
.operation = prepare.header.operation,
.parent = prepare.header.request_checksum,
.request_checksum = prepare.header.request_checksum,
.client = prepare.header.client,
.request = prepare.header.request,
.cluster = prepare.header.cluster,
Expand Down Expand Up @@ -4386,7 +4386,7 @@ pub fn ReplicaType(
log.debug("{}: on_request: ignoring older request", .{self.replica});
return true;
} else if (entry.header.request == message.header.request) {
if (message.header.checksum == entry.header.parent) {
if (message.header.checksum == entry.header.request_checksum) {
assert(entry.header.operation == message.header.operation);

log.debug("{}: on_request: replying to duplicate request", .{self.replica});
Expand Down Expand Up @@ -4450,7 +4450,7 @@ pub fn ReplicaType(
assert(message.header.view <= self.view); // See ignore_request_message_backup().
assert(message.header.session == 0 or message.header.operation != .register);
assert(message.header.request == 0 or message.header.operation != .register);
assert(message.header.checksum == entry.header.parent);
assert(message.header.checksum == entry.header.request_checksum);
assert(message.header.request == entry.header.request);

if (entry.header.size == @sizeOf(Header)) {
Expand Down

0 comments on commit 2561700

Please sign in to comment.