SOLR-12513 Reproducing TestCodecSupport.testMixedCompressionMode failure

solr/CHANGES.txt

@@ -109,6 +109,8 @@ Bug Fixes
 
 * SOLR-12482: Config API returns status 0 for failed operations. (Steve Rowe)
 
+* SOLR-12513: Reproducing TestCodecSupport.testMixedCompressionMode failure (Erick Erickson)
+
 Optimizations
 ----------------------
 

solr/core/src/test/org/apache/solr/core/TestCodecSupport.java

@@ -153,7 +153,7 @@ public void testMixedCompressionMode() throws Exception {
         "//*[@numFound='3']");
     assertQ(req("q", "text:foo"), 
         "//*[@numFound='3']");
-    assertU(optimize());
+    assertU(optimize("maxSegments", "1"));
     assertCompressionMode("BEST_SPEED", h.getCore());
     System.clearProperty("tests.COMPRESSION_MODE");
   }

solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java

@@ -31,8 +31,11 @@
 import org.apache.solr.index.LogByteSizeMergePolicyFactory;
 import org.apache.solr.index.LogDocMergePolicyFactory;
 import org.apache.solr.index.MergePolicyFactory;
+import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.search.SolrIndexSearcher;
+import org.apache.solr.update.CommitUpdateCommand;
 import org.apache.solr.update.SolrIndexConfigTest;
+import org.apache.solr.update.UpdateHandler;
 import org.apache.solr.util.RefCounted;
 import org.junit.After;
 
@@ -123,7 +126,7 @@ public void testTieredMergePolicyConfig() throws Exception {
     assertNumSegments(h.getCore(), 2);
     assertCompoundSegments(h.getCore(), expectCFS);
 
-    assertU(optimize());
+    assertU(optimize("maxSegments", "1"));
     assertNumSegments(h.getCore(), 1);
     // we've now forced a merge, and the MP ratio should be in play
     assertCompoundSegments(h.getCore(), false);
@@ -146,6 +149,15 @@ public void testNoMergePolicyFactoryConfig() throws Exception {
     initCore("solrconfig-nomergepolicyfactory.xml","schema-minimal.xml");
     iwc = solrConfig.indexConfig.toIndexWriterConfig(h.getCore());
     assertEquals(mergePolicy, iwc.getMergePolicy());
+
+    UpdateHandler updater = h.getCore().getUpdateHandler();
+    SolrQueryRequest req = req();
+    CommitUpdateCommand cmtCmd = new CommitUpdateCommand(req, true);
+    cmtCmd.maxOptimizeSegments = -1;
+    expectThrows(IllegalArgumentException.class, () -> {
+      updater.commit(cmtCmd);
+    });
+
   }
 
   public void testLogMergePolicyFactoryConfig() throws Exception {
@@ -180,7 +192,6 @@ private void implTestLogMergePolicyConfig(String solrConfigFileName,
 
     assertEquals(11, logMP.getMergeFactor());
     assertEquals(456, logMP.getMaxMergeDocs());
-
   }
 
   /**
@@ -256,5 +267,4 @@ private static void assertCompoundSegments(IndexReader reader,
                    ((SegmentReader)atomic.reader()).getSegmentInfo().info.getUseCompoundFile());
     }
   }
-
 }

solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java

@@ -265,7 +265,7 @@ private static class RetrievalCombo {
   private void testRptWithGeometryField(String fieldName) throws Exception {
     assertU(adoc("id", "0", fieldName, "ENVELOPE(-10, 20, 15, 10)"));
     assertU(adoc("id", "1", fieldName, "BUFFER(POINT(-10 15), 5)"));//circle at top-left corner
-    assertU(optimize());// one segment.
+    assertU(optimize("maxSegments", "1"));// one segment.
     assertU(commit());
 
     // Search to the edge but not quite touching the indexed envelope of id=0.  It requires geom validation to

solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java

@@ -379,7 +379,7 @@ public void testExpungeDeletes() throws Exception {
   @Test
   public void testPrepareCommit() throws Exception {
     assertU(adoc("id", "999"));
-    assertU(optimize());     // make sure there's just one segment
+    assertU(optimize("maxSegments", "1"));     // make sure there's just one segment
     assertU(commit());       // commit a second time to make sure index files aren't still referenced by the old searcher
 
     SolrQueryRequest sr = req();