You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/03/05 07:00:15 UTC
[1/2] lucene-solr git commit: SOLR-8788:
CollectionTooManyReplicasTest.testDownedShards failures
Repository: lucene-solr
Updated Branches:
refs/heads/master 81feea250 -> a15845ea5
SOLR-8788: CollectionTooManyReplicasTest.testDownedShards failures
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f09c5590
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f09c5590
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f09c5590
Branch: refs/heads/master
Commit: f09c5590e5f102bb38d65129967f8710f478df48
Parents: ab35faf
Author: Noble Paul <no...@apache.org>
Authored: Sat Mar 5 11:29:43 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Mar 5 11:29:43 2016 +0530
----------------------------------------------------------------------
.../apache/solr/cloud/OverseerCollectionMessageHandler.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f09c5590/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index 4d802e9..6b7f606 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -2056,9 +2056,10 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
"Collection: " + collection + " shard: " + shard + " does not exist");
}
ShardHandler shardHandler = shardHandlerFactory.getShardHandler();
+ boolean skipCreateReplicaInClusterState = message.getBool(SKIP_CREATE_REPLICA_IN_CLUSTER_STATE, false);
// Kind of unnecessary, but it does put the logic of whether to override maxShardsPerNode in one place.
- if(node == null) {
+ if (!skipCreateReplicaInClusterState) {
node = getNodesForNewReplicas(clusterState, collection, shard, 1, node,
overseer.getZkController().getCoreContainer()).get(0).nodeName;
}
@@ -2069,7 +2070,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
}
if (coreName == null) {
coreName = Assign.buildCoreName(coll, shard);
- } else if (!message.getBool(SKIP_CREATE_REPLICA_IN_CLUSTER_STATE, false)) {
+ } else if (!skipCreateReplicaInClusterState) {
//Validate that the core name is unique in that collection
for (Slice slice : coll.getSlices()) {
for (Replica replica : slice.getReplicas()) {
@@ -2084,7 +2085,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
ModifiableSolrParams params = new ModifiableSolrParams();
if (!Overseer.isLegacy(zkStateReader.getClusterProps())) {
- if (!message.getBool(SKIP_CREATE_REPLICA_IN_CLUSTER_STATE, false)) {
+ if (!skipCreateReplicaInClusterState) {
ZkNodeProps props = new ZkNodeProps(Overseer.QUEUE_OPERATION, ADDREPLICA.toLower(), ZkStateReader.COLLECTION_PROP,
collection, ZkStateReader.SHARD_ID_PROP, shard, ZkStateReader.CORE_NAME_PROP, coreName,
ZkStateReader.STATE_PROP, Replica.State.DOWN.toString(), ZkStateReader.BASE_URL_PROP,
[2/2] lucene-solr git commit: Merge remote-tracking branch
'origin/master'
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a15845ea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a15845ea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a15845ea
Branch: refs/heads/master
Commit: a15845ea598459a5739bb40b172d5493cb52da98
Parents: f09c559 81feea2
Author: Noble Paul <no...@apache.org>
Authored: Sat Mar 5 11:30:06 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Mar 5 11:30:06 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 7 +
.../org/apache/lucene/codecs/PointWriter.java | 7 +
.../codecs/lucene60/Lucene60PointWriter.java | 5 +
.../org/apache/lucene/index/CodecReader.java | 5 +
.../lucene/search/join/GlobalOrdinalsQuery.java | 27 +-
.../join/GlobalOrdinalsWithScoreQuery.java | 35 +-
.../apache/lucene/search/join/TestJoinUtil.java | 103 ++++
.../document/LatLonPointDistanceQuery.java | 2 +-
.../lucene/search/TestLatLonPointQueries.java | 86 +++-
.../org/apache/lucene/spatial/util/GeoRect.java | 5 +
solr/CHANGES.txt | 2 +
.../solr/cloud/CollectionsAPISolrJTest.java | 474 +++++++++++++++++++
.../solr/cloud/CollectionsAPISolrJTests.java | 472 ------------------
.../apache/solr/common/cloud/ZkStateReader.java | 32 +-
14 files changed, 755 insertions(+), 507 deletions(-)
----------------------------------------------------------------------