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/10/08 02:30:30 UTC
[08/30] lucene-solr:jira/http2: SOLR-12750: Migrate API should lock
the collection instead of shard
SOLR-12750: Migrate API should lock the collection instead of shard
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/84683b6a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/84683b6a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/84683b6a
Branch: refs/heads/jira/http2
Commit: 84683b6aa072459b364c62e71abd526cdcf8e117
Parents: 65105aa
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Oct 3 16:24:26 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Oct 3 16:24:26 2018 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/common/params/CollectionParams.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84683b6a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 576140c..28736cb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -131,6 +131,8 @@ Bug Fixes
* SOLR-12648: Autoscaling framework based replica placement is not used unless a policy is specified or
non-empty cluster policy exists. (shalin)
+* SOLR-12750: Migrate API should lock the collection instead of shard. (shalin)
+
================== 7.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84683b6a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
index 6fb348f..dee2f5f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
@@ -86,7 +86,7 @@ public interface CollectionParams {
CREATESHARD(true, LockLevel.COLLECTION),
DELETEREPLICA(true, LockLevel.SHARD),
FORCELEADER(true, LockLevel.SHARD),
- MIGRATE(true, LockLevel.SHARD),
+ MIGRATE(true, LockLevel.COLLECTION),
ADDROLE(true, LockLevel.NONE),
REMOVEROLE(true, LockLevel.NONE),
CLUSTERPROP(true, LockLevel.NONE),