jsancio commented on code in PR #15859:
URL: https://github.com/apache/kafka/pull/15859#discussion_r1596953465
##########
raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftMetricsTest.java:
##########
@@ -73,23 +88,35 @@ private QuorumState buildQuorumState(Set<Integer> voters) {
);
}
- @Test
- public void shouldRecordVoterQuorumState() {
- QuorumState state = buildQuorumState(Utils.mkSet(localId, 1, 2));
+ @ParameterizedTest
+ @ValueSource(shorts = {0, 1})
+ public void shouldRecordVoterQuorumState(short kraftVersion) {
+ boolean withDirectoryId = kraftVersion > 0;
+ Map<Integer, VoterSet.VoterNode> voterMap =
VoterSetTest.voterMap(Utils.mkSet(1, 2), withDirectoryId);
+ voterMap.put(localId, VoterSetTest.voterNode(ReplicaKey.of(localId,
Optional.of(localDirectoryId))));
Review Comment:
Yes. Fixed. Excuse the minor errors.
##########
raft/src/test/java/org/apache/kafka/raft/internals/VoterSetTest.java:
##########
@@ -79,20 +81,79 @@ void testRemoveVoter() {
);
}
+ @Test
+ void testIsVoterWithDirectoryId() {
+ Map<Integer, VoterSet.VoterNode> aVoterMap = voterMap(Arrays.asList(1,
2, 3), true);
+ VoterSet voterSet = new VoterSet(new HashMap<>(aVoterMap));
+
+ assertTrue(voterSet.isVoter(aVoterMap.get(1).voterKey()));
+ assertFalse(voterSet.isVoter(ReplicaKey.of(1,
Optional.of(Uuid.randomUuid()))));
+ assertFalse(voterSet.isVoter(ReplicaKey.of(1, Optional.empty())));
+ assertFalse(
+ voterSet.isVoter(ReplicaKey.of(2,
aVoterMap.get(1).voterKey().directoryId()))
+ );
+ assertFalse(
+ voterSet.isVoter(ReplicaKey.of(4,
aVoterMap.get(1).voterKey().directoryId()))
+ );
+ assertFalse(voterSet.isVoter(ReplicaKey.of(4, Optional.empty())));
+ }
+
+ @Test
+ void testIsVoterWithoutDirectoryId() {
+ Map<Integer, VoterSet.VoterNode> aVoterMap = voterMap(Arrays.asList(1,
2, 3), false);
+ VoterSet voterSet = new VoterSet(new HashMap<>(aVoterMap));
+
+ assertTrue(voterSet.isVoter(ReplicaKey.of(1, Optional.empty())));
+ assertTrue(voterSet.isVoter(ReplicaKey.of(1,
Optional.of(Uuid.randomUuid()))));
+ assertFalse(voterSet.isVoter(ReplicaKey.of(4,
Optional.of(Uuid.randomUuid()))));
+ assertFalse(voterSet.isVoter(ReplicaKey.of(4, Optional.empty())));
+ }
+
+ @Test
+ void testStandaloneAndIsOnlyVoter() {
Review Comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
