You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/03/06 15:13:54 UTC
svn commit: r1825992 -
/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
Author: mreutegg
Date: Tue Mar 6 15:13:54 2018
New Revision: 1825992
URL: http://svn.apache.org/viewvc?rev=1825992&view=rev
Log:
OAK-7309: MongoDocumentStoreMetricsTest fails sporadically
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java?rev=1825992&r1=1825991&r2=1825992&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java Tue Mar 6 15:13:54 2018
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
+import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.junit.After;
@@ -34,6 +35,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.stats.StatsOptions.METRICS_ONLY;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeNotNull;
public class MongoDocumentStoreMetricsTest extends AbstractMongoConnectionTest {
@@ -48,24 +50,30 @@ public class MongoDocumentStoreMetricsTe
}
@Test
- public void updateCounters() throws Exception {
+ public void updateCounters() {
+ MongoConnection connection = connectionFactory.getConnection();
+ assumeNotNull(connection);
MongoDocumentStore store = new MongoDocumentStore(
- mongoConnection.getDB(), newMongoDocumentNodeStoreBuilder());
- MongoDocumentStoreMetrics metrics = new MongoDocumentStoreMetrics(store, statsProvider);
- metrics.run();
- // document for root node
- assertEquals(1, getCount("MongoDB.nodes.count"));
- // one cluster node
- assertEquals(1, getCount("MongoDB.clusterNodes.count"));
-
- List<UpdateOp> updates = new ArrayList<>();
- for (int i = 0; i < 10; i++) {
- updates.add(new UpdateOp("id-" + i, true));
+ connection.getDB(), newMongoDocumentNodeStoreBuilder());
+ try {
+ MongoDocumentStoreMetrics metrics = new MongoDocumentStoreMetrics(store, statsProvider);
+ metrics.run();
+ // document for root node
+ assertEquals(1, getCount("MongoDB.nodes.count"));
+ // one cluster node
+ assertEquals(1, getCount("MongoDB.clusterNodes.count"));
+
+ List<UpdateOp> updates = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ updates.add(new UpdateOp("id-" + i, true));
+ }
+ assertTrue(store.create(Collection.NODES, updates));
+
+ metrics.run();
+ assertEquals(11, getCount("MongoDB.nodes.count"));
+ } finally {
+ store.dispose();
}
- assertTrue(store.create(Collection.NODES, updates));
-
- metrics.run();
- assertEquals(11, getCount("MongoDB.nodes.count"));
}
private long getCount(String name) {