merge trunk up to r1670679

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene6271@1670680 13f79535-47bb-0310-9956-ffa450edef68

dev-tools/scripts/createPatch.py

@@ -90,7 +90,7 @@ def run_diff(from_dir, to_dir, skip_whitespace):
     flags += 'bBw'
 
   args = ['diff', flags]
-  for ignore in ('.svn', '.git', 'build', '.caches', '.idea', 'idea-build', 'eclipse-build'):
+  for ignore in ('.svn', '.git', 'build', '.caches', '.idea', 'idea-build', 'eclipse-build', '.settings'):
     args.append('-x')
     args.append(ignore)
   args.append(from_dir)

solr/CHANGES.txt

@@ -376,6 +376,9 @@ Bug Fixes
 * SOLR-6924: The config API forcefully refreshes all replicas in the collection to ensure all are
   updated (Noble Paul)
 
+* SOLR-7266: The IgnoreCommitOptimizeUpdateProcessor blocks commit requests from
+  replicas needing to recover. (Jessica Cheng Mallet, Timothy Potter)
+
 Optimizations
 ----------------------
 

solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java

@@ -118,6 +118,12 @@ class IgnoreCommitOptimizeUpdateProcessor extends UpdateRequestProcessor {
       return;
     }
 
+    if (cmd.getReq().getParams().getBool(DistributedUpdateProcessor.COMMIT_END_POINT, false)) {
+      // this is a targeted commit from replica to leader needed for recovery, so can't be ignored
+      if (next != null) next.processCommit(cmd);
+      return;
+    }
+
     final String cmdType = cmd.optimize ? "optimize" : "commit";
     if (errorCode != null) {
       IgnoreCommitOptimizeUpdateProcessorFactory.log.info(

solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java

@@ -52,15 +52,29 @@ public class IgnoreCommitOptimizeUpdateProcessorFactoryTest extends SolrTestCase
 
     rsp = processCommit("ignore-optimize-only-from-client-403", true);
     assertNotNull("Sending an optimize should have resulted in an exception in the response", rsp.getException());
+    // commit should happen if DistributedUpdateProcessor.COMMIT_END_POINT == true
+    rsp = processCommit("ignore-commit-from-client-403", false, new Boolean(true));
+    shouldBeNull = rsp.getException();
+    assertNull("Sending a commit should NOT have resulted in an exception in the response: "+shouldBeNull, shouldBeNull);
   }
 
   SolrQueryResponse processCommit(final String chain, boolean optimize) throws IOException {
+    return processCommit(chain, optimize, null);
+  }
+
+  SolrQueryResponse processCommit(final String chain, boolean optimize, Boolean commitEndPoint) throws IOException {
     SolrCore core = h.getCore();
     UpdateRequestProcessorChain pc = core.getUpdateProcessingChain(chain);
     assertNotNull("No Chain named: " + chain, pc);
 
     SolrQueryResponse rsp = new SolrQueryResponse();
     SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams());
+
+    if (commitEndPoint != null) {
+      ((ModifiableSolrParams)req.getParams()).set(
+          DistributedUpdateProcessor.COMMIT_END_POINT, commitEndPoint.booleanValue());
+    }
+
     try {
       SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req,rsp));
       CommitUpdateCommand cmd = new CommitUpdateCommand(req, false);