You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/02/07 12:23:18 UTC

lucene-solr:master: SOLR-5944: Reverting the previous fix for SolrCmdDistributor

Repository: lucene-solr
Updated Branches:
  refs/heads/master 3574404e3 -> 0d760aedd


SOLR-5944: Reverting the previous fix for SolrCmdDistributor


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

Branch: refs/heads/master
Commit: 0d760aeddbc95f2de977dcaed781547f2cbf715f
Parents: 3574404
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Tue Feb 7 04:22:35 2017 -0800
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Tue Feb 7 04:22:35 2017 -0800

----------------------------------------------------------------------
 .../solr/update/processor/DistributedUpdateProcessor.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0d760aed/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
index e36b7c9..8f5d909 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@ -799,16 +799,8 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
 
       if (cmd.isInPlaceUpdate()) {
         params.set(DISTRIB_INPLACE_PREVVERSION, String.valueOf(cmd.prevVersion));
-        // Use synchronous=true so that a new connection is used, instead
-        // of the update being streamed through an existing streaming client.
-        // When using a streaming client, the previous update
-        // and the current in-place update (that depends on the previous update), if reordered
-        // in the stream, can result in the current update being bottled up behind the previous
-        // update in the stream and can lead to degraded performance.
-        cmdDistrib.distribAdd(cmd, nodes, params, true, replicationTracker);
-      } else {
-        cmdDistrib.distribAdd(cmd, nodes, params, false, replicationTracker);
       }
+      cmdDistrib.distribAdd(cmd, nodes, params, false, replicationTracker);
     }
     
     // TODO: what to do when no idField?