From 84683b6aa072459b364c62e71abd526cdcf8e117 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Wed, 3 Oct 2018 16:24:26 +0530 Subject: [PATCH] SOLR-12750: Migrate API should lock the collection instead of shard --- solr/CHANGES.txt | 2 ++ .../java/org/apache/solr/common/params/CollectionParams.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 576140cbe52..28736cbeedd 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. 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 6fb348f25c8..dee2f5f89c3 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),