This is an automated email from the ASF dual-hosted git repository.
bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 3e3c7b10889 [cherry-pick][branch-2.9] fix cherry-pick #17609 #17957
import (#18793)
3e3c7b10889 is described below
commit 3e3c7b108897899b1652e6adc94d970c59609e23
Author: congbo <[email protected]>
AuthorDate: Wed Dec 7 18:44:02 2022 +0800
[cherry-pick][branch-2.9] fix cherry-pick #17609 #17957 import (#18793)
### Motivation
fix cherry-pick #17609 import
fix cherry-pick #17957 import
fix cherry-pick #16878 lose problem
fix cherry-pick #17503 problem
---
.../test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java | 3 ++-
.../org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java | 5 +++--
.../org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java | 8 ++++----
pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc | 1 -
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
index e076821855e..9f6a10894c9 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
@@ -83,6 +83,7 @@ import org.apache.pulsar.common.naming.TopicDomain;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.AutoFailoverPolicyData;
import org.apache.pulsar.common.policies.data.AutoFailoverPolicyType;
+import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride;
import org.apache.pulsar.common.policies.data.BacklogQuota;
import org.apache.pulsar.common.policies.data.BrokerNamespaceIsolationData;
import org.apache.pulsar.common.policies.data.BrokerNamespaceIsolationDataImpl;
@@ -1677,7 +1678,7 @@ public class AdminApi2Test extends
MockedPulsarServiceBaseTest {
public void testForceDeleteNamespaceWithAutomaticTopicCreation() throws
Exception {
conf.setForceDeleteNamespaceAllowed(true);
final String namespaceName = "prop-xyz2/ns1";
- TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1",
"role2"), Set.of("test"));
+ TenantInfoImpl tenantInfo = new
TenantInfoImpl(Sets.newHashSet("role1", "role2"), Sets.newHashSet("test"));
admin.tenants().createTenant("prop-xyz2", tenantInfo);
admin.namespaces().createNamespace(namespaceName, 1);
admin.namespaces().setAutoTopicCreation(namespaceName,
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
index 7a6de0d7072..ecb587f553a 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
@@ -27,6 +27,7 @@ import com.google.common.collect.Sets;
import java.net.URL;
import java.time.Duration;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
@@ -549,7 +550,7 @@ public class BacklogQuotaManagerTest {
consumer2.receive();
}
- TopicStats stats = getTopicStats(topic1);
+ TopicStats stats = admin.topics().getStats(topic1);
assertEquals(stats.getSubscriptions().get(subName1).getMsgBacklog(),
5);
assertEquals(stats.getSubscriptions().get(subName2).getMsgBacklog(),
5);
@@ -566,7 +567,7 @@ public class BacklogQuotaManagerTest {
Thread.sleep(2000L);
rolloverStats();
- TopicStats stats2 = getTopicStats(topic1);
+ TopicStats stats2 = admin.topics().getStats(topic1);
// The first 5 messages should be expired due to limit time is 5
seconds, and the last 9 message should not.
Awaitility.await().untilAsserted(() -> {
assertEquals(stats2.getSubscriptions().get(subName1).getMsgBacklog(), 9);
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
index 6b5f002ab41..f74e72ce882 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
@@ -264,12 +264,12 @@ public class ManagedCursorMetricsTest extends
MockedPulsarServiceBaseTest {
metricsList = metrics.generate();
Assert.assertEquals(metricsList.size(), 2);
-
Assert.assertEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_writeLedgerSize"),
26L);
-
Assert.assertEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_writeLedgerLogicalSize"),
13L);
+
Assert.assertNotEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_writeLedgerSize"),
0L);
+
Assert.assertNotEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_writeLedgerLogicalSize"),
0L);
Assert.assertEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_readLedgerSize"),
0L);
-
Assert.assertEquals(metricsList.get(1).getMetrics().get("brk_ml_cursor_writeLedgerSize"),
26L);
-
Assert.assertEquals(metricsList.get(1).getMetrics().get("brk_ml_cursor_writeLedgerLogicalSize"),
13L);
+
Assert.assertNotEquals(metricsList.get(1).getMetrics().get("brk_ml_cursor_writeLedgerSize"),
0L);
+
Assert.assertNotEquals(metricsList.get(1).getMetrics().get("brk_ml_cursor_writeLedgerLogicalSize"),
0L);
Assert.assertEquals(metricsList.get(1).getMetrics().get("brk_ml_cursor_readLedgerSize"),
0L);
// cleanup.
diff --git a/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
b/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
index c78c12eaec0..18723684afe 100644
--- a/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
+++ b/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
@@ -459,7 +459,6 @@ void MultiTopicsConsumerImpl::messageReceived(Consumer
consumer, const Message&
}
messages_.push(msg);
if (messageListener_) {
- unAckedMessageTrackerPtr_->add(msg.getMessageId());
listenerExecutor_->postWork(
std::bind(&MultiTopicsConsumerImpl::internalListener,
shared_from_this(), consumer));
}
