This is an automated email from the ASF dual-hosted git repository. technoboy pushed a commit to branch branch-2.11 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 7b871fd6a3c3c32ccdbefbb01b160eb645ce0919 Author: fengyubiao <[email protected]> AuthorDate: Wed Aug 17 09:47:34 2022 +0800 [fix][flaky-test]LedgerOffloaderMetricsTest (#17106) --- .../broker/stats/LedgerOffloaderMetricsTest.java | 59 ---------------------- 1 file changed, 59 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java index 1d49d8d6e4e..f9ff2d2081d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java @@ -18,30 +18,16 @@ */ package org.apache.pulsar.broker.stats; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.Map; import java.util.List; -import java.util.Optional; -import java.util.Queue; import java.util.UUID; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import org.apache.bookkeeper.mledger.LedgerOffloader; -import org.apache.bookkeeper.mledger.ManagedLedger; -import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.mledger.impl.LedgerOffloaderStatsImpl; -import org.apache.pulsar.broker.service.BrokerService; import org.apache.pulsar.broker.service.BrokerTestBase; -import org.apache.pulsar.broker.service.Topic; -import org.apache.pulsar.broker.service.persistent.PersistentTopic; -import org.mockito.Mockito; -import org.mockito.stubbing.Answer; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -67,30 +53,9 @@ public class LedgerOffloaderMetricsTest extends BrokerTestBase { String []topics = new String[3]; LedgerOffloaderStatsImpl offloaderStats = (LedgerOffloaderStatsImpl) pulsar.getOffloaderStats(); - - LedgerOffloader offloader = Mockito.mock(LedgerOffloader.class); - Topic topic = Mockito.mock(PersistentTopic.class); - CompletableFuture<Optional<Topic>> topicFuture = new CompletableFuture<>(); - Optional<Topic> topicOptional = Optional.of(topic); - topicFuture.complete(topicOptional); - BrokerService brokerService = spy(pulsar.getBrokerService()); - doReturn(brokerService).when(pulsar).getBrokerService(); - - for (int i = 0; i < 3; i++) { String topicName = "persistent://prop/ns-abc1/testMetrics" + UUID.randomUUID(); topics[i] = topicName; - admin.topics().createNonPartitionedTopic(topicName); - - doReturn(topicFuture).when(brokerService).getTopicIfExists(topicName); - assertTrue(topic instanceof PersistentTopic); - - ManagedLedger ledgerM = Mockito.mock(ManagedLedger.class); - doReturn(ledgerM).when(((PersistentTopic) topic)).getManagedLedger(); - ManagedLedgerConfig config = Mockito.mock(ManagedLedgerConfig.class); - doReturn(config).when(ledgerM).getConfig(); - doReturn(offloader).when(config).getLedgerOffloader(); - offloaderStats.recordOffloadError(topicName); offloaderStats.recordOffloadError(topicName); offloaderStats.recordOffloadBytes(topicName, 100); @@ -123,15 +88,6 @@ public class LedgerOffloaderMetricsTest extends BrokerTestBase { String ns2 = "prop/ns-abc2"; LedgerOffloaderStatsImpl offloaderStats = (LedgerOffloaderStatsImpl) pulsar.getOffloaderStats(); - - LedgerOffloader offloader = Mockito.mock(LedgerOffloader.class); - Topic topic = Mockito.mock(PersistentTopic.class); - CompletableFuture<Optional<Topic>> topicFuture = new CompletableFuture<>(); - Optional<Topic> topicOptional = Optional.of(topic); - topicFuture.complete(topicOptional); - BrokerService brokerService = spy(pulsar.getBrokerService()); - doReturn(brokerService).when(pulsar).getBrokerService(); - Queue<String> queue = new LinkedList<>(); Map<String, List<String>> namespace2Topics = new HashMap<>(); for (int s = 0; s < 2; s++) { String nameSpace = ns1; @@ -146,20 +102,6 @@ public class LedgerOffloaderMetricsTest extends BrokerTestBase { String topicName = baseTopic1 + UUID.randomUUID(); List<String> topicList = namespace2Topics.get(nameSpace); topicList.add(topicName); - - queue.add(topicName); - admin.topics().createNonPartitionedTopic(topicName); - doReturn(topicFuture).when(brokerService).getTopicIfExists(topicName); - assertTrue(topic instanceof PersistentTopic); - - - ManagedLedger ledgerM = Mockito.mock(ManagedLedger.class); - doReturn(ledgerM).when(((PersistentTopic) topic)).getManagedLedger(); - ManagedLedgerConfig config = Mockito.mock(ManagedLedgerConfig.class); - doReturn(config).when(ledgerM).getConfig(); - doReturn(offloader).when(config).getLedgerOffloader(); - Mockito.when(ledgerM.getName()).thenAnswer((Answer<String>) invocation -> queue.poll()); - offloaderStats.recordOffloadError(topicName); offloaderStats.recordOffloadBytes(topicName, 100); offloaderStats.recordReadLedgerLatency(topicName, 1000, TimeUnit.NANOSECONDS); @@ -171,7 +113,6 @@ public class LedgerOffloaderMetricsTest extends BrokerTestBase { } for (Map.Entry<String, List<String>> entry : namespace2Topics.entrySet()) { - String namespace = entry.getKey(); List<String> topics = entry.getValue(); String topicName = topics.get(0);
