Skip to content

RATIS-2165. Do not include RaftClientRequest Message in ReadIndexRequest #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szetszwo merged 2 commits into from
Oct 9, 2024
Merged

RATIS-2165. Do not include RaftClientRequest Message in ReadIndexRequest #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
508d11c
improve read_index
133tosakarin Sep 30, 2024
b9056a1
rename
133tosakarin Oct 1, 2024
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
6 changes: 5 additions & 1 deletion ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,13 @@ static ByteBuffer toRaftClientRequestProtoByteBuffer(RaftClientRequest request)
}

static RaftClientRequestProto toRaftClientRequestProto(RaftClientRequest request) {
return toRaftClientRequestProto(request, true);
}

static RaftClientRequestProto toRaftClientRequestProto(RaftClientRequest request, boolean withMsg) {
final RaftClientRequestProto.Builder b = RaftClientRequestProto.newBuilder()
.setRpcRequest(toRaftRpcRequestProtoBuilder(request));
if (request.getMessage() != null) {
if (withMsg && request.getMessage() != null) {
b.setMessage(toClientMessageEntryProtoBuilder(request.getMessage()));
}

Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static ReadIndexRequestProto toReadIndexRequestProto(
RaftClientRequest clientRequest, RaftGroupMemberId requestorId, RaftPeerId replyId) {
return ReadIndexRequestProto.newBuilder()
.setServerRequest(ClientProtoUtils.toRaftRpcRequestProtoBuilder(requestorId, replyId))
.setClientRequest(ClientProtoUtils.toRaftClientRequestProto(clientRequest))
.setClientRequest(ClientProtoUtils.toRaftClientRequestProto(clientRequest, false))
.build();
}

Expand Down