You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ni...@apache.org on 2023/02/09 15:22:50 UTC
[pulsar] branch master updated: [fix] [test] fix flaky test MetadataStoreStatsTest.testMetadataStoreStats (#19433)
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 329c8c02fda [fix] [test] fix flaky test MetadataStoreStatsTest.testMetadataStoreStats (#19433)
329c8c02fda is described below
commit 329c8c02fda225c8711bf6ef15ecbfe9e026a803
Author: fengyubiao <yu...@streamnative.io>
AuthorDate: Thu Feb 9 23:22:42 2023 +0800
[fix] [test] fix flaky test MetadataStoreStatsTest.testMetadataStoreStats (#19433)
---
.../java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java | 2 ++
.../src/test/java/org/apache/pulsar/metadata/CounterTest.java | 1 +
.../org/apache/pulsar/metadata/impl/MetadataStoreFactoryImplTest.java | 4 +++-
.../storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java | 1 +
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
index c889f94b608..80bb6256591 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
@@ -207,6 +207,8 @@ public abstract class BookKeeperClusterTestCase {
}
// stop zookeeper service
try {
+ // cleanup for metrics.
+ metadataStore.close();
stopZKCluster();
} catch (Exception e) {
LOG.error("Got Exception while trying to stop ZKCluster", e);
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java
index ead80a02873..c5b4012f0c8 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java
@@ -87,6 +87,7 @@ public class CounterTest extends BaseMetadataStoreTest {
// Delete all the empty container nodes
zks.checkContainers();
+ @Cleanup
MetadataStoreExtended store2 = MetadataStoreExtended.create(metadataUrl, MetadataStoreConfig.builder().build());
@Cleanup
CoordinationService cs2 = new CoordinationServiceImpl(store2);
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImplTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImplTest.java
index ba12ddff062..c0159be4303 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImplTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImplTest.java
@@ -20,6 +20,7 @@ package org.apache.pulsar.metadata.impl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import lombok.Cleanup;
import org.apache.pulsar.metadata.api.GetResult;
import org.apache.pulsar.metadata.api.MetadataStore;
import org.apache.pulsar.metadata.api.MetadataStoreConfig;
@@ -55,7 +56,8 @@ public class MetadataStoreFactoryImplTest {
@Test
- public void testCreate() throws MetadataStoreException{
+ public void testCreate() throws Exception{
+ @Cleanup
MetadataStore instance = MetadataStoreFactoryImpl.create(
"custom://localhost",
MetadataStoreConfig.builder().build());
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java
index 052d643ba71..dabaf10cfe3 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java
@@ -131,6 +131,7 @@ public abstract class MockedBookKeeperTestCase {
}
protected void stopMetadataStore() throws Exception {
+ metadataStore.close();
metadataStore.setAlwaysFail(new MetadataStoreException("error"));
}