You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/06/04 01:47:06 UTC
svn commit: r1489231 - in /lucene/dev/branches/lucene_solr_4_3: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/common/src/test/org/apache/lucene/analysis/util/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/b...
Author: hossman
Date: Mon Jun 3 23:47:04 2013
New Revision: 1489231
URL: http://svn.apache.org/r1489231
Log:
SOLR-4744: hackish attempt to get basic non cloud functionality to work again (merge r1489222)
Modified:
lucene/dev/branches/lucene_solr_4_3/ (props changed)
lucene/dev/branches/lucene_solr_4_3/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/classification/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/classification/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/classification/ivy.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/classification/src/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene_solr_4_3/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1489231&r1=1489230&r2=1489231&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Mon Jun 3 23:47:04 2013
@@ -867,7 +867,8 @@ public class DistributedUpdateProcessor
DistribPhase phase =
DistribPhase.parseParam(req.getParams().get(DISTRIB_UPDATE_PARAM));
- DocCollection coll = zkController.getClusterState().getCollection(collection);
+ DocCollection coll = zkEnabled
+ ? zkController.getClusterState().getCollection(collection) : null;
if (zkEnabled && DistribPhase.NONE == phase) {
boolean leaderForAnyShard = false; // start off by assuming we are not a leader for any shard
@@ -982,10 +983,10 @@ public class DistributedUpdateProcessor
vinfo.unblockUpdates();
}
- List<Node> subShardLeaders = getSubShardLeaders(coll, cloudDesc.getShardId(), null, null);
-
// forward to all replicas
- if (leaderLogic) {
+ if (leaderLogic && zkEnabled) {
+ List<Node> subShardLeaders = getSubShardLeaders(coll, cloudDesc.getShardId(), null, null);
+
ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(VERSION_FIELD, Long.toString(cmd.getVersion()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());