From f2c837cb32fddec32f892874c9e6db07b1bf01d8 Mon Sep 17 00:00:00 2001 From: Mathias Fussenegger Date: Tue, 24 Feb 2015 13:52:26 +0100 Subject: [PATCH] add ThreadLeakFilter to RecoveryTests --- .../java/io/crate/integrationtests/RecoveryTests.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/blob/src/test/java/io/crate/integrationtests/RecoveryTests.java b/blob/src/test/java/io/crate/integrationtests/RecoveryTests.java index 15bc6bf6f41d..5f900bb42fa2 100644 --- a/blob/src/test/java/io/crate/integrationtests/RecoveryTests.java +++ b/blob/src/test/java/io/crate/integrationtests/RecoveryTests.java @@ -21,6 +21,8 @@ package io.crate.integrationtests; +import com.carrotsearch.randomizedtesting.ThreadFilter; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; import io.crate.blob.PutChunkAction; import io.crate.blob.PutChunkRequest; import io.crate.blob.StartBlobAction; @@ -43,6 +45,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.test.ElasticsearchThreadFilter; import org.junit.Test; import java.security.MessageDigest; @@ -60,8 +63,16 @@ import static org.hamcrest.core.IsEqual.equalTo; @CrateIntegrationTest.ClusterScope(scope = CrateIntegrationTest.Scope.SUITE, numNodes = 0) +@ThreadLeakFilters(defaultFilters = true, filters = {ElasticsearchThreadFilter.class, RecoveryTests.RecoveryTestThreadFilter.class}) public class RecoveryTests extends CrateIntegrationTest { + public static class RecoveryTestThreadFilter implements ThreadFilter { + @Override + public boolean reject(Thread t) { + return (t.getName().contains("blob-uploader")); + } + } + private final TimeValue ACCEPTABLE_RELOCATION_TIME = new TimeValue(25, TimeUnit.MINUTES); // the time to sleep between chunk requests in upload