Skip to content

Commit de4e24d

Browse files
authored
RATIS-2165. Do not include RaftClientRequest Message in ReadIndexRequest (#1160)
1 parent da3f90b commit de4e24d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,13 @@ static ByteBuffer toRaftClientRequestProtoByteBuffer(RaftClientRequest request)
204204
}
205205

206206
static RaftClientRequestProto toRaftClientRequestProto(RaftClientRequest request) {
207+
return toRaftClientRequestProto(request, true);
208+
}
209+
210+
static RaftClientRequestProto toRaftClientRequestProto(RaftClientRequest request, boolean withMsg) {
207211
final RaftClientRequestProto.Builder b = RaftClientRequestProto.newBuilder()
208212
.setRpcRequest(toRaftRpcRequestProtoBuilder(request));
209-
if (request.getMessage() != null) {
213+
if (withMsg && request.getMessage() != null) {
210214
b.setMessage(toClientMessageEntryProtoBuilder(request.getMessage()));
211215
}
212216

ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static ReadIndexRequestProto toReadIndexRequestProto(
114114
RaftClientRequest clientRequest, RaftGroupMemberId requestorId, RaftPeerId replyId) {
115115
return ReadIndexRequestProto.newBuilder()
116116
.setServerRequest(ClientProtoUtils.toRaftRpcRequestProtoBuilder(requestorId, replyId))
117-
.setClientRequest(ClientProtoUtils.toRaftClientRequestProto(clientRequest))
117+
.setClientRequest(ClientProtoUtils.toRaftClientRequestProto(clientRequest, false))
118118
.build();
119119
}
120120

0 commit comments

Comments
 (0)