You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/10/17 15:53:26 UTC

[13/50] [abbrv] lucene-solr:jira/solr-11320: SOLR-11452: TestTlogReplica.testOnlyLeaderIndexes() failure

SOLR-11452: TestTlogReplica.testOnlyLeaderIndexes() failure


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5e1474dc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5e1474dc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5e1474dc

Branch: refs/heads/jira/solr-11320
Commit: 5e1474dca46b1faea4189661190ee14cdd6dc067
Parents: 0673c57
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Oct 10 10:11:59 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Oct 10 10:11:59 2017 +0700

----------------------------------------------------------------------
 .../src/test/org/apache/solr/cloud/TestTlogReplica.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5e1474dc/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index 79dce4d..c978a5f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -489,16 +489,23 @@ public class TestTlogReplica extends SolrCloudTestCase {
     waitForNumDocsInAllActiveReplicas(2);
     assertCopyOverOldUpdates(1, timeCopyOverPerCores);
 
+    boolean firstCommit = true;
     // UpdateLog copy over old updates
     for (int i = 15; i <= 150; i++) {
       cloudClient.add(collectionName, sdoc("id",String.valueOf(i)));
       if (random().nextInt(100) < 15 & i != 150) {
+        if (firstCommit) {
+          // because tlog replicas periodically ask leader for new segments,
+          // therefore the copy over old updates action must not be triggered until
+          // tlog replicas actually get new segments
+          assertCopyOverOldUpdates(1, timeCopyOverPerCores);
+          firstCommit = false;
+        }
         cloudClient.commit(collectionName);
       }
     }
     checkRTG(120,150, cluster.getJettySolrRunners());
     waitForReplicasCatchUp(20);
-    assertCopyOverOldUpdates(2, timeCopyOverPerCores);
   }
   
   @SuppressWarnings("unchecked")