hachikuji commented on a change in pull request #9916:
URL: https://github.com/apache/kafka/pull/9916#discussion_r561344761
##########
File path: raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java
##########
@@ -750,9 +748,9 @@ void start(int nodeId) {
PersistentState persistentState = nodes.get(nodeId);
MockNetworkChannel channel = new
MockNetworkChannel(correlationIdCounter);
MockMessageQueue messageQueue = new MockMessageQueue();
- List<Node> voterNodes = voterNodesFromIds(voters,
Cluster::nodeAddress);
- RaftConfig raftConfig = buildRaftConfig(REQUEST_TIMEOUT_MS,
RETRY_BACKOFF_MS, ELECTION_TIMEOUT_MS,
- ELECTION_JITTER_MS, FETCH_TIMEOUT_MS, LINGER_MS,
voterNodes);
+ Map<Integer, InetSocketAddress> voterNodes =
voterNodesFromIds(voters, Cluster::nodeAddress);
Review comment:
nit: `voterNodes` -> `voterAddresses` or `voterAddressMap`?
##########
File path: raft/src/test/java/org/apache/kafka/raft/RaftTestUtil.java
##########
@@ -16,36 +16,15 @@
*/
package org.apache.kafka.raft;
-import org.apache.kafka.common.Node;
-
import java.net.InetSocketAddress;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
public class RaftTestUtil {
- public static RaftConfig buildRaftConfig(
- int requestTimeoutMs,
- int retryBackoffMs,
- int electionTimeoutMs,
- int electionBackoffMs,
- int fetchTimeoutMs,
- int appendLingerMs,
- List<Node> voterNodes
- ) {
- Map<Integer, InetSocketAddress> voterConnections = voterNodes.stream()
- .collect(Collectors.toMap(Node::id, node -> new
InetSocketAddress(node.host(), node.port())));
- return new RaftConfig(voterConnections, requestTimeoutMs,
retryBackoffMs, electionTimeoutMs, electionBackoffMs,
- fetchTimeoutMs, appendLingerMs);
- }
-
- public static List<Node> voterNodesFromIds(Set<Integer> voterIds,
+ public static Map<Integer, InetSocketAddress>
voterNodesFromIds(Set<Integer> voterIds,
Review comment:
nit: maybe `buildAddressMap` or something like that?
##########
File path: raft/src/test/java/org/apache/kafka/raft/RaftTestUtil.java
##########
@@ -16,36 +16,15 @@
*/
package org.apache.kafka.raft;
-import org.apache.kafka.common.Node;
-
import java.net.InetSocketAddress;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
public class RaftTestUtil {
- public static RaftConfig buildRaftConfig(
- int requestTimeoutMs,
- int retryBackoffMs,
- int electionTimeoutMs,
- int electionBackoffMs,
- int fetchTimeoutMs,
- int appendLingerMs,
- List<Node> voterNodes
- ) {
- Map<Integer, InetSocketAddress> voterConnections = voterNodes.stream()
- .collect(Collectors.toMap(Node::id, node -> new
InetSocketAddress(node.host(), node.port())));
- return new RaftConfig(voterConnections, requestTimeoutMs,
retryBackoffMs, electionTimeoutMs, electionBackoffMs,
- fetchTimeoutMs, appendLingerMs);
- }
-
- public static List<Node> voterNodesFromIds(Set<Integer> voterIds,
+ public static Map<Integer, InetSocketAddress>
voterNodesFromIds(Set<Integer> voterIds,
Function<Integer,
InetSocketAddress> voterAddressGenerator) {
- return voterIds.stream().map(voterId -> {
- InetSocketAddress voterAddress =
voterAddressGenerator.apply(voterId);
- return new Node(voterId, voterAddress.getHostName(),
voterAddress.getPort());
- }).collect(Collectors.toList());
+ return voterIds.stream().collect(Collectors.toMap(id -> id,
voterAddressGenerator));
Review comment:
Guess we can keep it, but this helper doesn't seem to be doing much for
us anymore.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
