You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by te...@apache.org on 2022/05/26 04:56:36 UTC
[pulsar] branch branch-2.9 updated: [branch-2.9][broker][test] Fix flaky test `testDeleteNamespaceBeforeCommit` (#15798)
This is an automated email from the ASF dual-hosted git repository.
technoboy 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 5cd5ded1ae1 [branch-2.9][broker][test] Fix flaky test `testDeleteNamespaceBeforeCommit` (#15798)
5cd5ded1ae1 is described below
commit 5cd5ded1ae18227b6a5e630f1a302f5810322db4
Author: Qiang Zhao <ma...@gmail.com>
AuthorDate: Thu May 26 12:56:25 2022 +0800
[branch-2.9][broker][test] Fix flaky test `testDeleteNamespaceBeforeCommit` (#15798)
---
.../apache/pulsar/broker/transaction/TransactionProduceTest.java | 6 +++---
.../org/apache/pulsar/broker/transaction/TransactionTestBase.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java
index 350dfa8c3d0..316c2f9f9df 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java
@@ -91,7 +91,7 @@ public class TransactionProduceTest extends TransactionTestBase {
@Test
public void testDeleteNamespaceBeforeCommit() throws Exception {
- final String topic = NAMESPACE1 + "/testDeleteTopicBeforeCommit";
+ final String topic = "persistent://" + NAMESPACE3 + "/testDeleteTopicBeforeCommit";
PulsarClient pulsarClient = this.pulsarClient;
Transaction tnx = pulsarClient.newTransaction()
.withTransactionTimeout(60, TimeUnit.SECONDS)
@@ -113,8 +113,8 @@ public class TransactionProduceTest extends TransactionTestBase {
outProducer.newMessage(tnx).value(content.getBytes(UTF_8)).send();
try {
- admin.namespaces().deleteNamespace(NAMESPACE1, true);
- } catch (Exception ignore) {}
+ admin.namespaces().deleteNamespace(NAMESPACE3, true);
+ } catch (Exception ignore) { }
tnx.commit().get();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java
index 2829aa9f913..b1a82802c1f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java
@@ -86,6 +86,7 @@ public abstract class TransactionTestBase extends TestRetrySupport {
public static final String TENANT = "tnx";
protected static final String NAMESPACE1 = TENANT + "/ns1";
+ protected static final String NAMESPACE3 = TENANT + "/ns3";
protected ServiceConfiguration conf = new ServiceConfiguration();
public void internalSetup() throws Exception {
@@ -130,6 +131,7 @@ public abstract class TransactionTestBase extends TestRetrySupport {
admin.tenants().createTenant(TENANT,
new TenantInfoImpl(Sets.newHashSet("appid1"), Sets.newHashSet(CLUSTER_NAME)));
admin.namespaces().createNamespace(NAMESPACE1);
+ admin.namespaces().createNamespace(NAMESPACE3);
if (numPartitions == 0) {
admin.topics().createNonPartitionedTopic(topic);
} else {