Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sorock/proto/sorock.proto
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ message WriteRequest {
message ReadRequest {
uint32 shard_id = 1;
bytes message = 2;
bool read_locally = 3;
}

// Response from the `RaftApp`.
Expand Down
1 change: 1 addition & 0 deletions sorock/src/communicator/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ impl Communicator {
let req = raft::ReadRequest {
shard_id: self.shard_id,
message: req.message,
read_locally: req.read_locally,
};
let resp = self.conn.client.clone().read(req).await?.into_inner();
Ok(resp.message)
Expand Down
2 changes: 2 additions & 0 deletions sorock/src/generated/sorock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ pub struct ReadRequest {
pub shard_id: u32,
#[prost(bytes = "bytes", tag = "2")]
pub message: ::prost::bytes::Bytes,
#[prost(bool, tag = "3")]
pub read_locally: bool,
}
/// Response from the `RaftApp`.
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down
Binary file modified sorock/src/generated/sorock_descriptor.bin
Binary file not shown.
1 change: 1 addition & 0 deletions sorock/src/process/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub mod request {

pub struct UserReadRequest {
pub message: Bytes,
pub read_locally: bool,
}

pub struct KernRequest {
Expand Down
11 changes: 7 additions & 4 deletions sorock/src/process/raft_process/responder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,13 @@ impl RaftProcess {
anyhow::bail!(Error::LeaderUnknown)
};

let resp = if std::matches!(
self.voter.read_election_state(),
voter::ElectionState::Leader
) {
let will_process = req.read_locally
|| std::matches!(
self.voter.read_election_state(),
voter::ElectionState::Leader
);

let resp = if will_process {
let (user_completion, rx) = completion::prepare_user_completion();

let read_index = self.command_log.commit_pointer.load(Ordering::SeqCst);
Expand Down
1 change: 1 addition & 0 deletions sorock/src/raft_service/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ impl raft::raft_server::Raft for RaftService {
let shard_id = req.shard_id;
let req = request::UserReadRequest {
message: req.message,
read_locally: req.read_locally,
};
let resp = self
.node
Expand Down
2 changes: 2 additions & 0 deletions tests/testapp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ impl Client {
let req = ReadRequest {
shard_id,
message: AppReadRequest::Read.serialize(),
read_locally: false,
};
let resp = self.cli.clone().read(req).await?.into_inner();
let resp = AppState::deserialize(&resp.message);
Expand All @@ -101,6 +102,7 @@ impl Client {
let req = ReadRequest {
shard_id,
message: AppReadRequest::MakeSnapshot.serialize(),
read_locally: true,
};
let resp = self.cli.clone().read(req).await?.into_inner();
let resp = AppState::deserialize(&resp.message);
Expand Down