[lucene-solr] branch branch_7x updated: SOLR-12801: completely prevent tlog replicas from being used.

[ho...@apache.org]

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

hossman pushed a commit to branch branch_7x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_7x by this push:
     new afcc4fd  SOLR-12801: completely prevent tlog replicas from being used.
afcc4fd is described below

commit afcc4fd5d3b80dfcb86ce64fc45315013ddb1d3e
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Fri Jan 25 10:18:55 2019 -0700

    SOLR-12801: completely prevent tlog replicas from being used.
    
    This follows the spirit of the change Mark intended in his previous commit to this test, but his solution wasn't covering all cases on backcompat to branch_7x
    
    (see also: SOLR-12313)
    
    (cherry picked from commit e2b8b0e5b1f36e6ecedbeca50263cc6c263d7909)
---
 solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
index c004f71..636fd8b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
@@ -48,7 +48,8 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;
 @Nightly // this test is currently too slow for non nightly
 public class ForceLeaderTest extends HttpPartitionTest {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private final boolean onlyLeaderIndexes = random().nextBoolean();
+  // TODO: SOLR-12313 tlog replicas makes commits take way to long due to what is likely a bug and it's TestInjection use
+  private final boolean onlyLeaderIndexes = random().nextBoolean() && false; // consume same amount of random
 
   @BeforeClass
   public static void beforeClassSetup() {
@@ -61,7 +62,7 @@ public class ForceLeaderTest extends HttpPartitionTest {
   
   @Override
   protected boolean useTlogReplicas() {
-    return false; // TODO: tlog replicas makes commits take way to long due to what is likely a bug and it's TestInjection use
+    return onlyLeaderIndexes;
   }
 
   @Test