This is an automated email from the ASF dual-hosted git repository.
HoustonPutman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from fb7377cc11c New UI: Use URL from window.location (#4281)
add 7ab7a510584 SOLR-18011: Allow locked Admin APIs to call other locked
Admin APIs (#3916)
No new revisions were added by this update.
Summary of changes:
changelog/unreleased/solr-18011-locking-update.yml | 9 +
.../src/java/org/apache/solr/api/V2HttpCall.java | 6 +
.../cloud/DistributedCollectionLockFactory.java | 4 +-
.../org/apache/solr/cloud/DistributedLock.java | 4 +
.../apache/solr/cloud/DistributedMultiLock.java | 20 ++-
.../src/java/org/apache/solr/cloud/LockTree.java | 117 ++++++++++--
.../cloud/OverseerConfigSetMessageHandler.java | 22 ++-
.../apache/solr/cloud/OverseerMessageHandler.java | 9 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 31 +++-
.../cloud/ZkDistributedCollectionLockFactory.java | 6 +-
.../cloud/ZkDistributedConfigSetLockFactory.java | 2 +-
.../org/apache/solr/cloud/ZkDistributedLock.java | 94 ++++++++--
.../solr/cloud/ZkDistributedLockFactory.java | 18 +-
.../cloud/api/collections/AdminCmdContext.java | 36 +++-
.../api/collections/CollectionApiLockFactory.java | 31 +++-
.../api/collections/CollectionCommandContext.java | 1 +
.../api/collections/CollectionHandlingUtils.java | 20 ++-
...istributedCollectionConfigSetCommandRunner.java | 1 +
.../OverseerCollectionMessageHandler.java | 15 +-
.../solr/handler/admin/CollectionsHandler.java | 7 +-
.../solr/handler/admin/RebalanceLeaders.java | 4 +-
.../solr/handler/admin/api/AdminAPIBase.java | 4 +-
.../solr/handler/component/HttpShardHandler.java | 3 +
.../java/org/apache/solr/servlet/HttpSolrCall.java | 5 +
.../OverseerCollectionConfigSetProcessorTest.java | 108 +++++++++++
.../test/org/apache/solr/cloud/TestLockTree.java | 131 +++++++++++++-
.../apache/solr/cloud/ZkDistributedLockTest.java | 30 ++--
.../api/collections/CollectionApiLockingTest.java | 200 +++++++++++++++++++++
.../solr/common/params/CollectionAdminParams.java | 2 +
.../solr/common/params/CollectionParams.java | 6 +-
30 files changed, 860 insertions(+), 86 deletions(-)
create mode 100644 changelog/unreleased/solr-18011-locking-update.yml