[solr] branch branch_9x updated: SOLR-15969 Supress SimpleTextCodec on Backup Operations (#587)

[mdrob]

This is an automated email from the ASF dual-hosted git repository.

mdrob pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 0e63f26  SOLR-15969 Supress SimpleTextCodec on Backup Operations (#587)
0e63f26 is described below

commit 0e63f261cf74cee7568b20a98d366d45655b150a
Author: Mike Drob <md...@apache.org>
AuthorDate: Wed Feb 2 09:16:32 2022 -0600

    SOLR-15969 Supress SimpleTextCodec on Backup Operations (#587)
    
    Co-authored-by: Kevin Risden <kris...@apache.org>
    (cherry picked from commit a1ae39c1f6739458ac61530aaad9523c2a9a1e6c)
---
 .../solr/handler/component/DistributedQueryComponentCustomSortTest.java | 2 ++
 .../src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java     | 2 ++
 .../java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java | 2 ++
 .../src/java/org/apache/solr/handler/BackupRestoreUtils.java            | 1 +
 4 files changed, 7 insertions(+)

diff --git 
a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
 
b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
index c9d8661..7e72cc7 100644
--- 
a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
+++ 
b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
@@ -17,6 +17,7 @@
 package org.apache.solr.handler.component;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -35,6 +36,7 @@ import java.util.Objects;
  * @see org.apache.solr.handler.component.QueryComponent
  */
 @ThreadLeakLingering(linger = 10)
+@LuceneTestCase.SuppressCodecs({"SimpleText"}) // SimpleTextCodec is too slow 
and causes timeouts
 public class DistributedQueryComponentCustomSortTest extends 
BaseDistributedSearchTestCase {
 
   public DistributedQueryComponentCustomSortTest() {
diff --git 
a/solr/modules/hdfs/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
 
b/solr/modules/hdfs/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
index a19d87c..5add5c7 100644
--- 
a/solr/modules/hdfs/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
+++ 
b/solr/modules/hdfs/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.QuickPatchThreadsFilter;
 import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrIgnoredThreadsFilter;
@@ -64,6 +65,7 @@ import java.util.Map;
     BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
 })
 @SolrTestCaseJ4.SuppressSSL     // Currently unknown why SSL does not work 
with this test
+@LuceneTestCase.SuppressCodecs({"SimpleText"}) // Backups do checksum 
validation against a footer value not present in 'SimpleText'
 @ThreadLeakLingering(linger = 40)
 public class TestHdfsBackupRestoreCore extends SolrCloudTestCase {
   public static final String HDFS_REPO_SOLR_XML = "<solr>\n" +
diff --git 
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
 
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
index 77540ae..d03ff56 100644
--- 
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
+++ 
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
@@ -21,6 +21,7 @@ import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.lucene.mockfile.FilterPath;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -43,6 +44,7 @@ import org.junit.Test;
  * This test simply does a bunch of basic things in solrcloud mode and asserts 
things
  * work as expected.
  */
+@LuceneTestCase.SuppressCodecs({"SimpleText"}) // Backups do checksum 
validation against a footer value not present in 'SimpleText'
 public abstract class AbstractBasicDistributedZk2TestBase extends 
AbstractFullDistribZkTestBase {
   private static final String SHARD2 = "shard2";
   private static final String SHARD1 = "shard1";
diff --git 
a/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java 
b/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java
index 7617dc5..ae8ace4 100644
--- 
a/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java
+++ 
b/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java
@@ -57,6 +57,7 @@ public class BackupRestoreUtils extends SolrTestCase {
     }
     leaderClient.add(collectionName, docs);
     leaderClient.commit(collectionName);
+    verifyDocs(nDocs, leaderClient, collectionName);
     return nDocs;
   }