cmccabe commented on code in PR #16672:
URL: https://github.com/apache/kafka/pull/16672#discussion_r1695820312
##########
server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java:
##########
@@ -14,451 +14,506 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.kafka.server;
+import com.yammer.metrics.core.Gauge;
+import com.yammer.metrics.core.Metric;
+import com.yammer.metrics.core.MetricName;
+import com.yammer.metrics.core.MetricsRegistry;
import org.apache.kafka.clients.ClientResponse;
+import org.apache.kafka.clients.NodeApiVersions;
import org.apache.kafka.common.Uuid;
import org.apache.kafka.common.errors.AuthenticationException;
import org.apache.kafka.common.errors.UnsupportedVersionException;
+import org.apache.kafka.common.message.ApiVersionsResponseData;
import org.apache.kafka.common.message.AssignReplicasToDirsRequestData;
import org.apache.kafka.common.message.AssignReplicasToDirsResponseData;
+import org.apache.kafka.common.metadata.FeatureLevelRecord;
+import org.apache.kafka.common.metadata.PartitionRecord;
+import org.apache.kafka.common.metadata.RegisterBrokerRecord;
+import org.apache.kafka.common.metadata.TopicRecord;
import org.apache.kafka.common.protocol.Errors;
+import org.apache.kafka.common.requests.AbstractRequest;
+import org.apache.kafka.common.requests.ApiVersionsResponse;
import org.apache.kafka.common.requests.AssignReplicasToDirsRequest;
import org.apache.kafka.common.requests.AssignReplicasToDirsResponse;
-import org.apache.kafka.common.utils.MockTime;
-import org.apache.kafka.metadata.AssignmentsHelper;
+import org.apache.kafka.common.utils.ExponentialBackoff;
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.image.MetadataDelta;
+import org.apache.kafka.image.MetadataImage;
+import org.apache.kafka.image.MetadataProvenance;
+import org.apache.kafka.server.common.MetadataVersion;
import org.apache.kafka.server.common.TopicIdPartition;
-import org.apache.kafka.server.metrics.KafkaYammerMetrics;
import org.apache.kafka.test.TestUtils;
-import com.yammer.metrics.core.Gauge;
-import com.yammer.metrics.core.Metric;
-import com.yammer.metrics.core.MetricName;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.mockito.ArgumentCaptor;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.LinkedBlockingDeque;
import java.util.function.Function;
-import java.util.function.Supplier;
-import static org.apache.kafka.metadata.AssignmentsHelper.buildRequestData;
+import static
org.apache.kafka.server.AssignmentsManager.QUEUED_REPLICA_TO_DIR_ASSIGNMENTS_METRIC;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atMostOnce;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
public class AssignmentsManagerTest {
-
+ private static final Logger LOG =
LoggerFactory.getLogger(AssignmentsManagerTest.class);
private static final Uuid TOPIC_1 =
Uuid.fromString("88rnFIqYSZykX4ZSKv81bg");
private static final Uuid TOPIC_2 =
Uuid.fromString("VKCnzHdhR5uDQc1shqBYrQ");
+ private static final Uuid TOPIC_3 =
Uuid.fromString("ZeAwvYt-Ro2suQudGUdbRg");
private static final Uuid DIR_1 =
Uuid.fromString("cbgD8WdLQCyzLrFIMBhv3w");
private static final Uuid DIR_2 =
Uuid.fromString("zO0bDc0vSuam7Db9iH7rYQ");
private static final Uuid DIR_3 =
Uuid.fromString("CGBWbrFkRkeJQy6Aryzq2Q");
- private MockTime time;
- private NodeToControllerChannelManager channelManager;
- private AssignmentsManager manager;
-
- @BeforeEach
- public void setup() {
- time = new MockTime();
- channelManager = mock(NodeToControllerChannelManager.class);
- Map<Uuid, String> topicNames = new HashMap<>();
- topicNames.put(TOPIC_1, "TOPIC_1");
- topicNames.put(TOPIC_2, "TOPIC_2");
- Map<Uuid, String> dirPaths = new HashMap<>();
- dirPaths.put(DIR_1, "DIR_1");
- dirPaths.put(DIR_2, "DIR_2");
- dirPaths.put(DIR_3, "DIR_3");
- manager = new AssignmentsManager(time, channelManager, 8, () -> 100L,
- id -> Optional.ofNullable(dirPaths.get(id)), id ->
Optional.ofNullable(topicNames.get(id)));
+ private static final MetadataImage TEST_IMAGE;
+
+ static {
+ MetadataDelta delta = new MetadataDelta.Builder().
+ setImage(MetadataImage.EMPTY).
+ build();
+ delta.replay(new FeatureLevelRecord().
+ setName(MetadataVersion.FEATURE_NAME).
+ setFeatureLevel(MetadataVersion.IBP_3_8_IV0.featureLevel()));
+ delta.replay(new RegisterBrokerRecord().
+ setBrokerId(0).
+ setIncarnationId(Uuid.fromString("JJsH6zB0R7eKbr0Sy49ULw")).
+ setBrokerEpoch(123));
+ delta.replay(new RegisterBrokerRecord().
+ setBrokerId(1).
+ setIncarnationId(Uuid.fromString("DtnWclXyQ4qNDvL97JlnvQ")).
+ setBrokerEpoch(456));
+ delta.replay(new RegisterBrokerRecord().
+ setBrokerId(2).
+ setIncarnationId(Uuid.fromString("UFa_RKgLR4mxEXyquEPEmg")).
+ setBrokerEpoch(789));
+ delta.replay(new RegisterBrokerRecord().
+ setBrokerId(3).
+ setIncarnationId(Uuid.fromString("jj-cnHYASAmb_H9JR6nmtQ")).
+ setBrokerEpoch(987));
+ delta.replay(new TopicRecord().
+ setName("foo").
+ setTopicId(TOPIC_1));
+ delta.replay(new PartitionRecord().
+ setPartitionId(0).
+ setTopicId(TOPIC_1).
+ setReplicas(Arrays.asList(0, 1, 2)).
+ setIsr(Arrays.asList(0, 1, 2)).
+ setLeader(1));
+ delta.replay(new PartitionRecord().
+ setPartitionId(1).
+ setTopicId(TOPIC_1).
+ setReplicas(Arrays.asList(1, 2, 3)).
+ setIsr(Arrays.asList(1, 2, 3)).
+ setLeader(1));
+ delta.replay(new TopicRecord().
+ setName("bar").
+ setTopicId(TOPIC_2));
+ delta.replay(new PartitionRecord().
+ setPartitionId(0).
+ setTopicId(TOPIC_2).
+ setReplicas(Arrays.asList(0, 3, 2)).
+ setIsr(Arrays.asList(0, 3, 2)).
+ setLeader(1));
+ delta.replay(new PartitionRecord().
+ setPartitionId(1).
+ setTopicId(TOPIC_2).
+ setReplicas(Arrays.asList(1, 2, 3)).
+ setIsr(Arrays.asList(2)).
+ setLeader(2));
+ delta.replay(new PartitionRecord().
+ setPartitionId(2).
+ setTopicId(TOPIC_2).
+ setReplicas(Arrays.asList(3, 2, 1)).
+ setIsr(Arrays.asList(3, 2, 1)).
+ setLeader(3));
Review Comment:
I wanted to have one or two partitions that weren't used just to make it a
bit more "realistic"
##########
server/src/main/java/org/apache/kafka/server/AssignmentsManager.java:
##########
@@ -17,6 +17,9 @@
package org.apache.kafka.server;
+import com.yammer.metrics.core.Gauge;
Review Comment:
yes, I fixed this
--
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]
