You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/15 02:20:40 UTC
[3/3] lucene-solr:jira/solr-11702: SOLR-11702: javadoc
SOLR-11702: javadoc
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6febecbf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6febecbf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6febecbf
Branch: refs/heads/jira/solr-11702
Commit: 6febecbf208faf034d443da5f6cba6eea14de32d
Parents: 4879156
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Jan 15 09:20:23 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Jan 15 09:20:23 2018 +0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java | 1 +
.../src/java/org/apache/solr/handler/admin/CollectionsHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6febecbf/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
index 63b1b5a..d5aed65 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
@@ -398,6 +398,7 @@ public class CreateCollectionCmd implements Cmd {
public static void createCollectionZkNode(DistribStateManager stateManager, String collection, Map<String,String> params) {
log.debug("Check for collection zkNode:" + collection);
String collectionPath = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection;
+ // clean up old terms node
String termsPath = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection + "/terms";
try {
if (stateManager.hasData(termsPath)) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6febecbf/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index e25e563..b54cbaf 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -1008,7 +1008,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
.filter(rep -> zkShardTerms.registered(rep.getName()))
.mapToLong(rep -> zkShardTerms.getTerm(rep.getName()))
.max();
- // and increase terms of replicas less out-of-sync
+ // increase terms of replicas less out-of-sync
if (optionalMaxTerm.isPresent()) {
liveReplicas.stream()
.filter(rep -> zkShardTerms.getTerm(rep.getName()) == optionalMaxTerm.getAsLong())