Skip to content

SOLR-17963: Don't lock replica/collection property commands #3786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsmiley merged 1 commit into from
Oct 19, 2025
Merged

SOLR-17963: Don't lock replica/collection property commands #3786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,9 @@ Other Changes

* PR#3758: Logs: removed webapp=/solr and also removed from internal context map.

* SOLR-17963: These SolrCloud commands no longer aquire locks (waiting or blocking on other commands that do):
COLLECTIONPROP, ADDREPLICAPROP, DELETEREPLICAPROP. (David Smiley)

================== 9.10.0 ==================
New Features
---------------------
Expand Down
5 changes: 2 additions & 3 deletions solr/core/src/test/org/apache/solr/cloud/TestLockTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICAPROP;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICA;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOCK_REPLICA_TASK;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.MODIFYCOLLECTION;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.SPLITSHARD;

Expand Down Expand Up @@ -48,8 +49,6 @@ public void testLocks() throws Exception {
.getSession()
.lock(CollectionAction.BALANCESHARDUNIQUE, Arrays.asList("coll1", "shard1")));

assertNull(
lockTree.getSession().lock(ADDREPLICAPROP, Arrays.asList("coll1", "shard1", "core_node2")));
coll1Lock.unlock();
Lock shard1Lock =
lockTree
Expand All @@ -62,7 +61,7 @@ public void testLocks() throws Exception {
assertNotNull(replica1Lock);

List<Pair<CollectionAction, List<String>>> operations = new ArrayList<>();
operations.add(new Pair<>(ADDREPLICAPROP, Arrays.asList("coll1", "shard1", "core_node2")));
operations.add(new Pair<>(MOCK_REPLICA_TASK, Arrays.asList("coll1", "shard1", "core_node2")));
operations.add(new Pair<>(MODIFYCOLLECTION, Arrays.asList("coll1")));
operations.add(new Pair<>(SPLITSHARD, Arrays.asList("coll1", "shard1")));
operations.add(new Pair<>(SPLITSHARD, Arrays.asList("coll2", "shard2")));
Expand Down
6 changes: 3 additions & 3 deletions solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ enum CollectionAction {
ADDROLE(true, LockLevel.NONE),
REMOVEROLE(true, LockLevel.NONE),
CLUSTERPROP(true, LockLevel.NONE),
COLLECTIONPROP(true, LockLevel.COLLECTION),
COLLECTIONPROP(true, LockLevel.NONE), // atomic; no lock
REQUESTSTATUS(false, LockLevel.NONE),
DELETESTATUS(false, LockLevel.NONE),
ADDREPLICA(true, LockLevel.SHARD),
Expand All @@ -111,8 +111,8 @@ enum CollectionAction {
DISTRIBUTEDAPIPROCESSING(false, LockLevel.NONE),
LIST(false, LockLevel.NONE),
CLUSTERSTATUS(false, LockLevel.NONE),
ADDREPLICAPROP(true, LockLevel.REPLICA),
DELETEREPLICAPROP(true, LockLevel.REPLICA),
ADDREPLICAPROP(true, LockLevel.NONE), // atomic; no lock
DELETEREPLICAPROP(true, LockLevel.NONE), // atomic; no lock
BALANCESHARDUNIQUE(true, LockLevel.COLLECTION),
REBALANCELEADERS(true, LockLevel.COLLECTION),
MODIFYCOLLECTION(true, LockLevel.COLLECTION),
Expand Down
Loading