Apache Solr open-source search software
SOLR-13608: Ensure backup tests avoid SimpleText codec
Jason Gerlowski5fd420e00884
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCloudIncrementalBackupTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCloudIncrementalBackupTest.javaindex 17fbce04f92..c0d51d958e8 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCloudIncrementalBackupTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCloudIncrementalBackupTest.java@@ -27,12 +27,14 @@ import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.protocol.HdfsConstants;+import org.apache.lucene.util.LuceneTestCase;import org.apache.solr.cloud.hdfs.HdfsTestUtil;import org.apache.solr.common.util.IOUtils;import org.apache.solr.util.BadHdfsThreadsFilter;import org.junit.AfterClass;import org.junit.BeforeClass;[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'@ThreadLeakFilters(defaultFilters = true, filters = {BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)})diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.javaindex b552c6c5689..8ef048cf729 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java@@ -17,8 +17,10 @@package org.apache.solr.cloud.api.collections;+import org.apache.lucene.util.LuceneTestCase;import org.junit.BeforeClass;[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'public class LocalFSCloudIncrementalBackupTest extends AbstractIncrementalBackupTest {private static final String SOLR_XML = "<solr>\n" +"\n" +diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.javaindex 424a5c61fd0..67cc6ae5b4e 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java@@ -25,6 +25,7 @@ import java.util.Collection;import java.util.HashMap;import java.util.Map;+import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.QuickPatchThreadsFilter;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;@@ -60,6 +61,7 @@ import static org.apache.solr.core.backup.BackupManager.ZK_STATE_DIR;/*** This class implements the tests for HDFS integration for Solr backup/restore capability.*/[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'@ThreadLeakFilters(defaultFilters = true, filters = {SolrIgnoredThreadsFilter.class,QuickPatchThreadsFilter.class,diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.javaindex 672ba8cd56a..063dcf7fc66 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java@@ -23,6 +23,7 @@ import java.net.URI;import org.apache.lucene.store.Directory;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;+import org.apache.lucene.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -39,6 +40,7 @@ import org.junit.Test;* Solr backup/restore still requires a "shared" file-system. Its just that in this case such file-system would be* exposed via local file-system API.*/[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'public class TestLocalFSCloudBackupRestore extends AbstractCloudBackupRestoreTestCase {private static String backupLocation;diff --git a/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryIntegrationTest.java b/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryIntegrationTest.javaindex 769ad99c0d6..652719ac662 100644--- a/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryIntegrationTest.java@@ -27,6 +27,7 @@ import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.protocol.HdfsConstants;+import org.apache.lucene.util.LuceneTestCase;import org.apache.solr.cloud.api.collections.AbstractBackupRepositoryTest;import org.apache.solr.cloud.hdfs.HdfsTestUtil;import org.apache.solr.common.util.IOUtils;@@ -36,6 +37,7 @@ import org.apache.solr.util.BadHdfsThreadsFilter;import org.junit.AfterClass;import org.junit.BeforeClass;[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'@ThreadLeakFilters(defaultFilters = true, filters = {BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)})diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.javaindex dad6f4a9328..104de270942 100644--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java@@ -25,6 +25,7 @@ import java.util.Optional;import java.util.function.Function;import java.util.stream.Collectors;+import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;@@ -56,6 +57,7 @@ import org.slf4j.LoggerFactory;* This test uses the (now deprecated) traditional backup method/format. For more thorough tests using the new format,* see {@link org.apache.solr.handler.TestIncrementalCoreBackup}*/[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'@SolrTestCaseJ4.SuppressSSL // Currently unknown why SSL does not work with this test@Slowpublic class TestSolrCloudSnapshots extends SolrCloudTestCase {diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.javaindex 81e72fcab63..25634ac2be3 100644--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java@@ -31,6 +31,7 @@ import org.apache.lucene.index.IndexCommit;import org.apache.lucene.index.IndexNotFoundException;import org.apache.lucene.store.Directory;import org.apache.lucene.store.NIOFSDirectory;+import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;@@ -62,6 +63,7 @@ import org.slf4j.LoggerFactory;* These tests use the deprecated "full-snapshot" based backup method. For tests that cover similar snapshot* functionality incrementally, see {@link org.apache.solr.handler.TestIncrementalCoreBackup}*/[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'@SolrTestCaseJ4.SuppressSSL // Currently unknown why SSL does not work with this test@Slowpublic class TestSolrCoreSnapshots extends SolrCloudTestCase {diff --git a/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.java b/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.javaindex 5035827332d..8099827df6e 100644--- a/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.java@@ -17,6 +17,7 @@package org.apache.solr.handler;import org.apache.lucene.index.IndexCommit;+import org.apache.lucene.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.CoreContainer;@@ -37,6 +38,7 @@ import java.nio.file.Path;import java.nio.file.Paths;import java.util.Arrays;[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'public class TestIncrementalCoreBackup extends SolrTestCaseJ4 {@Before // unique core per testpublic void coreInit() throws Exception {diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.javaindex cab0f76a363..48d3f6d1e27 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java@@ -38,6 +38,7 @@ import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.Directory;import org.apache.lucene.store.NIOFSDirectory;+import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;@@ -52,6 +53,7 @@ import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'@SolrTestCaseJ4.SuppressSSL // Currently unknown why SSL does not work with this testpublic class TestReplicationHandlerBackup extends SolrJettyTestBase {diff --git a/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.java b/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.javaindex 688325d0993..c096dd18420 100644--- a/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.java@@ -20,6 +20,7 @@ import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexCommit;import org.apache.lucene.store.Directory;import org.apache.lucene.store.FSDirectory;+import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;@@ -34,6 +35,7 @@ import java.io.IOException;import java.nio.file.Paths;import java.util.Arrays;[email protected]({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'public class TestSnapshotCoreBackup extends SolrTestCaseJ4 {@Before // unique core per testpublic void coreInit() throws Exception {diff --git a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.javaindex f8f33a3ee17..2d760e6f544 100644--- a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java@@ -61,7 +61,7 @@ import java.util.regex.Matcher;import java.util.regex.Pattern;@Nightly-@SuppressCodecs({"SimpleText"})+@SuppressCodecs({"SimpleText"}) // Backups do checksum validation against a footer value not present in 'SimpleText'public class TestStressThreadBackup extends SolrCloudTestCase {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());