KAFKA-18561: Remove withKip853Rpc and replace it with withRaftProtocol #18600
Conversation
github-actions
bot
added
triage
|
Hi @ahuang98 |
frankvicky
force-pushed
the
KAFKA-18561
branch
from
2d4e93d to
aaaab78
Compare
frankvicky
force-pushed
the
KAFKA-18561
branch
2 times, most recently
from
c36f9bc to
312c113
Compare
|
@jsancio You're ok with this? |
frankvicky
force-pushed
the
KAFKA-18561
branch
from
312c113 to
d943da8
Compare
|
A label of 'needs-attention' was automatically added to this PR in order to raise the |
frankvicky
force-pushed
the
KAFKA-18561
branch
2 times, most recently
from
b93875b to
fabd9f6
Compare
|
A label of 'needs-attention' was automatically added to this PR in order to raise the |
frankvicky
force-pushed
the
KAFKA-18561
branch
2 times, most recently
from
4e56589 to
543467d
Compare
|
A label of 'needs-attention' was automatically added to this PR in order to raise the |
frankvicky
force-pushed
the
KAFKA-18561
branch
2 times, most recently
from
e135aed to
826ba56
Compare
There was a problem hiding this comment.
With this change it's more obvious that KafkaRaftClientTest only covers KIP_853_PROTOCOL and lower, I wonder if it would be worth doing one of the following
- have KafkaRaftClientTest test the whole range of RaftProtocols
- replace
KIP_853_PROTOCOLwithlatestProtocol()which will pick the last enum constant in RaftProtocol, and KafkaRaftClientTest will always test the newest protocol - java doc / rename for KafkaRaftClientTest to indicate this only covers a subset of the raft protocols
| @@ -2265,4 +2267,17 @@ public ByteBuffer buffer() { | |||
| return data; | |||
| } | |||
| } | |||
|
|
|||
| private boolean isSupport853(RaftProtocol raftProtocol) { | |||
There was a problem hiding this comment.
you can use RaftClientTestContext.isReconfigSupported()
There was a problem hiding this comment.
Thanks.
I don't notice that we have such a helper method.
| private static final String KIP_595_PROTOCOL = "KIP_595_PROTOCOL"; | ||
| private static final String KIP_853_PROTOCOL = "KIP_853_PROTOCOL"; |
There was a problem hiding this comment.
my slight pref would be to remove these and just use the strings directly in the EnumSource annotations
There was a problem hiding this comment.
suggestion should also be applied to KafkaRaftClientTest if you agree
| @CsvSource({ "false,false", "false,true", "true,false", "true,true" }) | ||
| public void testLeaderListenerNotified(boolean entireLog, boolean withKip853Rpc) throws Exception { | ||
| @MethodSource("generateKip853TestMatrix") | ||
| public void testLeaderListenerNotified(boolean entireLog, RaftProtocol raftProtocol) throws Exception { |
There was a problem hiding this comment.
I guess another option would be just renaming the second parameter to boolean isReconfigSupported, potentially easier for readers to know at a glance that we're not testing the entire set of raftProtocols (rather than navigating to the method source definition)
(then we would do .withRaftProtocol(isReconfigSupported ? KIP_853_PROTOCOL : KIP_595_PROTOCOL) which I understand is a bit bulkier)
| ReplicaKey voter1 = replicaKey(localId + 1, withKip853Rpc); | ||
| ReplicaKey voter2 = replicaKey(localId + 2, withKip853Rpc); | ||
| ReplicaKey observer3 = replicaKey(localId + 3, withKip853Rpc); | ||
| boolean support853 = isSupport853(raftProtocol); |
There was a problem hiding this comment.
nit: support853 -> reconfigSupported
There was a problem hiding this comment.
was this change applied everywhere? we should remove isSupport853() since it's a dupe of reconfigSupported()
There was a problem hiding this comment.
Hi @ahuang98
Sorry for inconvience. Previously, I had a finger issue when rebasing.
Now all comments should be applied. PTAL
There was a problem hiding this comment.
there was no inconvenience 😅 sorry to hear about your finger! I missed your update today and will review tomorrow morning
|
Hi @jsancio Many thanks! |
JIRA: KAFKA-18561
Remove
withKip853Rpcand replace it withwithRaftProtocoland adjust the corresponding test.Committer Checklist (excluded from commit message)