You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/20 11:56:59 UTC
[pulsar] 09/22: broker resource group test optimize fail msg (#12438)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit e8a629c06d4f23c33612dbc4b994fd4f7c6a25f4
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Sun Oct 24 12:41:55 2021 +0800
broker resource group test optimize fail msg (#12438)
(cherry picked from commit 86f40c1dc127aa9af928c544ff4062666c621ef4)
---
...esgsTest.java => RGUsageMTAggrWaitForAllMsgsTest.java} | 12 +++++-------
.../resourcegroup/ResourceGroupUsageAggregationTest.java | 15 +++++++--------
.../resourcegroup/ResourceUsageTransportManagerTest.java | 1 -
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMesgsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
similarity index 99%
rename from pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMesgsTest.java
rename to pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
index 9126009..fda8693 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMesgsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
@@ -20,7 +20,6 @@ package org.apache.pulsar.broker.resourcegroup;
import com.google.common.collect.Sets;
import io.prometheus.client.Summary;
-import java.util.Collections;
import org.apache.pulsar.broker.resourcegroup.ResourceGroup.BytesAndMessagesCount;
import org.apache.pulsar.broker.resourcegroup.ResourceGroup.ResourceGroupMonitoringClass;
import org.apache.pulsar.broker.resourcegroup.ResourceGroupService.ResourceGroupUsageStatsType;
@@ -59,7 +58,7 @@ import java.util.concurrent.TimeUnit;
// The tenants and namespaces in those topics are associated with a set of resource-groups (RGs).
// After sending/receiving all the messages, traffic usage statistics, and Prometheus-metrics
// are verified on the RGs.
-public class RGUsageMTAggrWaitForAllMesgsTest extends ProducerConsumerBase {
+public class RGUsageMTAggrWaitForAllMsgsTest extends ProducerConsumerBase {
@BeforeClass
@Override
protected void setup() throws Exception {
@@ -350,13 +349,12 @@ public class RGUsageMTAggrWaitForAllMesgsTest extends ProducerConsumerBase {
}
}
if ((numEqualRGs + numUnEqualRGs != numTopics) || (numEqualRGs > 0 && numUnEqualRGs > 0)) {
- String errMesg = String.format("Found {} topics with equal RGs and {} with unequal, on {} topics",
+ String errMesg = String.format("Found %s topics with equal RGs and %s with unequal, on %s topics",
numEqualRGs, numUnEqualRGs, numTopics);
throw new PulsarClientException(errMesg);
- } else if (numEqualRGs == numTopics) {
- return true;
+ } else {
+ return numEqualRGs == numTopics;
}
- return false;
}
private void registerTenantsAndNamespaces(String[] topicStrings) throws Exception {
@@ -788,7 +786,7 @@ public class RGUsageMTAggrWaitForAllMesgsTest extends ProducerConsumerBase {
Assert.assertNotEquals(ninetethPercentileValue, 0);
}
- private static final Logger log = LoggerFactory.getLogger(RGUsageMTAggrWaitForAllMesgsTest.class);
+ private static final Logger log = LoggerFactory.getLogger(RGUsageMTAggrWaitForAllMsgsTest.class);
// Empirically, there appears to be a 45-byte overhead for metadata, imposed by Pulsar runtime.
private static final int PER_MESSAGE_METADATA_OHEAD = 45;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java
index a89d759..08c1f61 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java
@@ -130,8 +130,8 @@ public class ResourceGroupUsageAggregationTest extends ProducerConsumerBase {
.subscriptionType(SubscriptionType.Shared)
.subscribe();
} catch (PulsarClientException p) {
- final String errMesg = String.format("Got exception while building consumer: ex={}", p.getMessage());
- Assert.assertTrue(false, errMesg);
+ final String errMsg = String.format("Got exception while building consumer: ex=%s", p.getMessage());
+ Assert.fail(errMsg);
}
final TopicName myTopic = TopicName.get(topicString);
@@ -146,16 +146,15 @@ public class ResourceGroupUsageAggregationTest extends ProducerConsumerBase {
int recvdNumBytes = 0;
int recvdNumMsgs = 0;
for (int ix = 0; ix < NumMessagesToSend; ix++) {
- MessageId prodMesgId = null;
byte[] mesg;
try {
- mesg = String.format("Hi, ix={}", ix).getBytes();
+ mesg = String.format("Hi, ix=%s", ix).getBytes();
producer.send(mesg);
sentNumBytes += mesg.length;
sentNumMsgs++;
} catch (PulsarClientException p) {
- final String errMesg = String.format("Got exception while sending {}-th time: ex={}", ix, p.getMessage());
- Assert.assertTrue(false, errMesg);
+ final String errMsg = String.format("Got exception while sending %s-th time: ex=%s", ix, p.getMessage());
+ Assert.fail(errMsg);
}
}
producer.close();
@@ -169,9 +168,9 @@ public class ResourceGroupUsageAggregationTest extends ProducerConsumerBase {
message = consumer.receive();
recvdNumBytes += message.getValue().length;
} catch (PulsarClientException p) {
- final String errMesg = String.format("Got exception in while receiving {}-th mesg at consumer: ex={}",
+ final String errMesg = String.format("Got exception in while receiving %s-th mesg at consumer: ex=%s",
recvdNumMsgs, p.getMessage());
- Assert.assertTrue(false, errMesg);
+ Assert.fail(errMesg);
}
// log.info("consumer received message : {} {}", message.getMessageId(), new String(message.getData()));
recvdNumMsgs++;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java
index 7332307..e8182d7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java
@@ -26,7 +26,6 @@ import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.ClusterData;
-import org.apache.pulsar.common.policies.data.ClusterDataImpl;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;