Skip to content

Commit

Permalink
mark flaky tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan Jansen <[email protected]>
  • Loading branch information
@farodin91 @FlorianHockmann
farodin91 authored and FlorianHockmann committed Jun 28, 2023
1 parent bf22b55 commit 2e54144
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 2 deletions.
7 changes: 7 additions & 0 deletions janusgraph-cql/src/test/java/org/janusgraph/core/cql/CQLConfiguredGraphFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package org.janusgraph.core.cql;

import com.datastax.driver.core.Session;
import io.github.artsok.RepeatedIfExceptionsTest;
import org.apache.commons.configuration2.MapConfiguration;
import org.janusgraph.JanusGraphCassandraContainer;
import org.janusgraph.core.AbstractConfiguredGraphFactoryTest;
Expand Down Expand Up @@ -130,5 +131,11 @@ public void dropGraphShouldRemoveGraphKeyspace() throws Exception {
ConfiguredGraphFactory.close(graphName);
}
}

@RepeatedIfExceptionsTest(repeats = 3)
@Override
public void updateConfigurationShouldRemoveGraphFromCache() throws Exception {
super.updateConfigurationShouldRemoveGraphFromCache();
}
}

8 changes: 8 additions & 0 deletions janusgraph-cql/src/test/java/org/janusgraph/graphdb/cql/CQLGraphTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

package org.janusgraph.graphdb.cql;

import io.github.artsok.RepeatedIfExceptionsTest;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
Expand Down Expand Up @@ -52,6 +53,7 @@
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ExecutionException;
import java.util.stream.Stream;

import static org.janusgraph.diskstorage.cql.CQLConfigOptions.ATOMIC_BATCH_MUTATE;
Expand Down Expand Up @@ -128,6 +130,12 @@ public void simpleLogTest(boolean useStringId) {
}
}

@RepeatedIfExceptionsTest(repeats = 3)
@Override
public void testReindexingForEdgeIndex() throws ExecutionException, InterruptedException {
super.testReindexingForEdgeIndex();
}

protected static Stream<Arguments> generateConsistencyConfigs() {
return Arrays.stream(new Arguments[]{
arguments(true, true, 20),
Expand Down
10 changes: 10 additions & 0 deletions janusgraph-cql/src/test/java/org/janusgraph/hadoop/CQLIndexManagementIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@

package org.janusgraph.hadoop;

import io.github.artsok.RepeatedIfExceptionsTest;
import org.janusgraph.JanusGraphCassandraContainer;
import org.janusgraph.diskstorage.BackendException;
import org.janusgraph.diskstorage.configuration.WriteConfiguration;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;

import java.util.concurrent.ExecutionException;

@Testcontainers
public class CQLIndexManagementIT extends AbstractIndexManagementIT {
@Container
Expand All @@ -28,4 +32,10 @@ public class CQLIndexManagementIT extends AbstractIndexManagementIT {
public WriteConfiguration getConfiguration() {
return cql.getConfiguration(getClass().getSimpleName().toLowerCase()).getConfiguration();
}

@RepeatedIfExceptionsTest(repeats = 3)
@Override
public void testRepairRelationIndex() throws ExecutionException, InterruptedException, BackendException {
super.testRepairRelationIndex();
}
}
9 changes: 9 additions & 0 deletions janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/CQLElasticsearchTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@

package org.janusgraph.diskstorage.es;

import io.github.artsok.RepeatedIfExceptionsTest;
import org.janusgraph.JanusGraphCassandraContainer;
import org.janusgraph.diskstorage.configuration.ModifiableConfiguration;
import org.junit.jupiter.api.Disabled;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;

import java.util.concurrent.ExecutionException;

@Testcontainers
public class CQLElasticsearchTest extends ElasticsearchJanusGraphIndexTest {

Expand All @@ -34,4 +37,10 @@ public ModifiableConfiguration getStorageConfiguration() {
@Override
@Disabled("CQL seems to not clear storage correctly")
public void testClearStorage() {}

@RepeatedIfExceptionsTest(repeats = 3)
@Override
public void testIndexUpdatesWithoutReindex() throws InterruptedException, ExecutionException {
super.testIndexUpdatesWithoutReindex();
}
}
3 changes: 1 addition & 2 deletions janusgraph-test/src/test/java/org/janusgraph/diskstorage/cache/ExpirationCacheTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.janusgraph.diskstorage.keycolumnvalue.cache.ExpirationKCVSCache;
import org.janusgraph.diskstorage.keycolumnvalue.cache.KCVSCache;
import org.janusgraph.diskstorage.util.BufferUtil;
import org.junit.jupiter.api.Test;

import java.time.Duration;
import java.time.Instant;
Expand Down Expand Up @@ -97,7 +96,7 @@ private void testExpiration(Duration expirationTime) throws Exception {
verifyResults(key, keys, query, 4);
}

@Test
@RepeatedIfExceptionsTest(repeats = 3)
public void testGracePeriod() throws Exception {
testGracePeriod(Duration.ofMillis(200));
testGracePeriod(Duration.ZERO);
Expand Down

2 comments on commit 2e54144

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 2e54144 Previous: 0681c56 Ratio
org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete 14570.057182395554 ms/op 14586.008647555847 ms/op 1.00
org.janusgraph.GraphCentricQueryBenchmark.getVertices 1380.8863613013239 ms/op 1403.492298047285 ms/op 0.98
org.janusgraph.MgmtOlapJobBenchmark.runClearIndex 221.28016552173912 ms/op 221.54146067826088 ms/op 1.00
org.janusgraph.MgmtOlapJobBenchmark.runReindex 469.53089385272733 ms/op 460.9890087106061 ms/op 1.02
org.janusgraph.JanusGraphSpeedBenchmark.basicCount 445.04298673267186 ms/op 346.66347764095144 ms/op 1.28
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 9522.2997773583 ms/op 4485.190292578381 ms/op 2.12
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingEmitRepeatSteps 33648.02840366072 ms/op 30665.192997429764 ms/op 1.10
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithSmallBatch 33653.666279846664 ms/op 23828.46548598333 ms/op 1.41
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.vertexCentricPropertiesFetching 67421.03600960001 ms/op 38983.8101016 ms/op 1.73
org.janusgraph.CQLMultiQueryBenchmark.getAllElementsTraversedFromOuterVertex 16632.593987108452 ms/op 15106.615220932421 ms/op 1.10
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithDoubleUnion 619.0712974157548 ms/op 587.1721059629838 ms/op 1.05
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithUnlimitedBatch 9107.358139775939 ms/op 4312.15499390924 ms/op 2.11
org.janusgraph.CQLMultiQueryBenchmark.getNames 16441.692535810816 ms/op 14979.155193266353 ms/op 1.10
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesThreePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 11498.028263197157 ms/op 7028.506374854091 ms/op 1.64
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFilteredByAndStep 669.4884789178653 ms/op 681.8268098321862 ms/op 0.98
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFromMultiNestedRepeatStepStartingFromSingleVertex 21753.651329825003 ms/op 20906.959035210002 ms/op 1.04
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithCoalesceUsage 595.2019151595802 ms/op 588.033972045627 ms/op 1.01
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 30148.170330968256 ms/op 21474.23874965 ms/op 1.40
org.janusgraph.CQLMultiQueryBenchmark.getIdToOutVerticesProjection 409.73045501999775 ms/op 424.85170239457113 ms/op 0.96
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithUnlimitedBatch 32388.775687449353 ms/op 27121.09184266667 ms/op 1.19
org.janusgraph.CQLMultiQueryBenchmark.getNeighborNames 16670.660221468355 ms/op 14606.05859399543 ms/op 1.14
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingRepeatUntilSteps 17759.96409560644 ms/op 16268.361992679524 ms/op 1.09
org.janusgraph.CQLMultiQueryBenchmark.getAdjacentVerticesLocalCounts 16799.107333123844 ms/op 15417.817227794843 ms/op 1.09

This comment was automatically generated by workflow using github-action-benchmark.

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 2e54144 Previous: 0681c56 Ratio
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 9522.2997773583 ms/op 4485.190292578381 ms/op 2.12
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithUnlimitedBatch 9107.358139775939 ms/op 4312.15499390924 ms/op 2.11

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.