You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ab...@apache.org on 2021/05/05 12:39:48 UTC
[solr] 02/03: Merge branch 'main' into jira/solr-15300
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-15300
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4336c9f316a69aa8f2b50ec9542a6950a6304b73
Merge: 01a85c0 19ea591
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed May 5 14:29:26 2021 +0200
Merge branch 'main' into jira/solr-15300
dev-docs/FAQ.adoc | 20 +
dev-docs/README.adoc | 16 +-
dev-docs/{dev-utilities.adoc => cloud-script.adoc} | 24 +-
.../overseer/images/configSet-processor-flow.png | Bin
.../overseer/images/locking-levels.png | Bin
.../overseer/images/session-lockTree-20nodes.png | Bin
.../overseer/images/session-lockTree1.png | Bin
.../overseer/images/session-lockTree2.png | Bin
.../images/single-thread-clusterstate-updater.png | Bin
.../overseer/images/state-change-steps.png | Bin
{solr/dev-docs => dev-docs}/overseer/overseer.adoc | 0
dev-docs/pmc-chair.adoc | 4 +-
dev-tools/doap/solr.rdf | 9 +-
dev-tools/scripts/README.md | 19 -
dev-tools/scripts/addBackcompatIndexes.py | 272 ------------
dev-tools/scripts/archive-solr-ref-guide.sh | 87 ----
{solr/cloud-dev => dev-tools/scripts}/cloud.sh | 17 +-
dev-tools/scripts/releaseWizard.py | 8 +-
dev-tools/scripts/releaseWizard.yaml | 135 +-----
gradle/ide/intellij-idea.gradle | 5 +
gradle/maven/defaults-maven.gradle | 2 +-
gradle/validation/check-environment.gradle | 2 +-
gradle/validation/forbidden-apis.gradle | 2 +-
gradle/validation/forbidden-apis/defaults.all.txt | 25 ++
.../validation/forbidden-apis/defaults.lucene.txt | 49 ---
gradle/validation/forbidden-apis/defaults.solr.txt | 35 --
gradle/validation/jar-checks.gradle | 2 +-
gradle/validation/validate-source-patterns.gradle | 35 --
gradle/wrapper/gradle-wrapper.jar.version | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
help/gpgSigning.txt | 70 +++
settings.gradle | 3 +-
solr/CHANGES.txt | 60 ++-
solr/NOTICE.txt | 53 +++
solr/README.md | 6 +-
solr/bin/install_solr_service.sh | 2 +-
solr/bin/post | 4 +-
solr/bin/solr | 2 +-
solr/bin/solr.in.cmd | 8 +-
solr/bin/solr.in.sh | 8 +-
...ExtractNamedEntitiesUpdateProcessorFactory.java | 2 +-
solr/contrib/extraction/README.md | 4 +-
.../extraction/ExtractingDocumentLoader.java | 2 +-
solr/contrib/gcs-repository/README.md | 4 +
solr/contrib/gcs-repository/build.gradle | 55 +++
.../org/apache/solr/gcs/GCSBackupRepository.java | 465 ++++++++++++++++++++
.../java/org/apache/solr/gcs/GCSConfigParser.java | 175 ++++++++
.../java/org/apache/solr/gcs/package-info.java} | 22 +-
.../gcs-repository/src/test-files/conf/schema.xml | 29 ++
.../src/test-files/conf/solrconfig.xml} | 41 +-
.../gcs-repository/src/test-files/log4j2.xml | 69 +++
.../solr/gcs/ConcurrentDelegatingStorage.java | 394 +++++++++++++++++
.../apache/solr/gcs/GCSBackupRepositoryTest.java | 71 ++++
.../apache/solr/gcs/GCSIncrementalBackupTest.java | 98 +++++
.../solr/gcs/LocalStorageGCSBackupRepository.java | 104 +++++
solr/contrib/jaegertracer-configurator/README.md | 34 +-
.../contrib/jaegertracer-configurator/build.gradle | 2 +-
.../solr/jaeger/JaegerTracerConfigurator.java | 56 +--
.../src/test-files/solr/solr.xml | 10 +-
.../apache/solr/jaeger/TestJaegerConfigurator.java | 106 ++---
...angDetectLanguageIdentifierUpdateProcessor.java | 5 +-
.../src/test-files/solr/solr.xml | 1 +
solr/core/build.gradle | 2 +-
.../apache/solr/cloud/ConfigSetApiLockFactory.java | 54 +++
.../java/org/apache/solr/cloud/ConfigSetCmds.java | 218 ++++++++++
.../solr/cloud/DistributedApiAsyncTracker.java | 355 ++++++++++++++++
.../cloud/DistributedCollectionLockFactory.java | 53 +++
.../cloud/DistributedConfigSetLockFactory.java | 41 ++
.../org/apache/solr/cloud/DistributedLock.java} | 24 +-
.../apache/solr/cloud/DistributedMultiLock.java | 76 ++++
.../cloud/OverseerConfigSetMessageHandler.java | 182 +-------
.../org/apache/solr/cloud/RecoveryStrategy.java | 6 +
.../solr/cloud/SizeLimitedDistributedMap.java | 28 +-
.../cloud/ZkDistributedCollectionLockFactory.java | 100 +++++
.../cloud/ZkDistributedConfigSetLockFactory.java | 60 +++
.../org/apache/solr/cloud/ZkDistributedLock.java | 234 ++++++++++
.../solr/cloud/ZkDistributedLockFactory.java | 66 +++
.../solr/cloud/api/collections/BackupCmd.java | 2 +-
.../solr/cloud/api/collections/CollApiCmds.java | 83 +++-
.../api/collections/CollectionApiLockFactory.java | 111 +++++
.../api/collections/CollectionCommandContext.java | 12 +-
.../cloud/api/collections/CreateCollectionCmd.java | 15 +-
.../cloud/api/collections/DeleteBackupCmd.java | 2 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 2 +-
...va => DistributedCollectionCommandContext.java} | 65 ++-
...istributedCollectionConfigSetCommandRunner.java | 471 +++++++++++++++++++++
.../api/collections/MaintainRoutedAliasCmd.java | 6 +-
.../collections/OcmhCollectionCommandContext.java | 5 +
.../OverseerCollectionMessageHandler.java | 50 +--
.../cloud/api/collections/OverseerRoleCmd.java | 5 +
.../cloud/api/collections/OverseerStatusCmd.java | 23 +-
.../solr/cluster/placement/AttributeFetcher.java | 6 -
.../solr/cluster/placement/AttributeValues.java | 5 -
.../placement/impl/AttributeFetcherImpl.java | 10 -
.../placement/impl/AttributeValuesImpl.java | 9 -
.../apache/solr/core/CancellableQueryTracker.java | 107 +++++
.../src/java/org/apache/solr/core/CloudConfig.java | 22 +-
.../java/org/apache/solr/core/ConfigOverlay.java | 4 +-
.../java/org/apache/solr/core/CoreContainer.java | 104 +++--
.../org/apache/solr/core/HdfsDirectoryFactory.java | 2 -
.../src/java/org/apache/solr/core/NodeConfig.java | 46 +-
.../src/java/org/apache/solr/core/SolrCore.java | 8 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 60 ++-
.../java/org/apache/solr/core/SolrXmlConfig.java | 32 +-
.../org/apache/solr/core/TracerConfigurator.java | 96 +++--
.../solr/core/backup/ShardBackupMetadata.java | 12 +-
.../core/backup/repository/BackupRepository.java | 1 +
.../java/org/apache/solr/handler/ClusterAPI.java | 4 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 29 +-
.../solr/handler/admin/CollectionsHandler.java | 271 +++++++-----
.../solr/handler/admin/ConfigSetsHandler.java | 42 +-
.../solr/handler/admin/LukeRequestHandler.java | 43 +-
.../apache/solr/handler/admin/MergeIndexesOp.java | 2 +-
.../solr/handler/admin/RebalanceLeaders.java | 8 +-
.../handler/admin/SegmentsInfoRequestHandler.java | 64 +--
.../solr/handler/admin/ZookeeperStatusHandler.java | 3 +
.../component/ActiveTasksListComponent.java | 117 +++++
.../handler/component/ActiveTasksListHandler.java | 105 +++++
.../solr/handler/component/CloudReplicaSource.java | 30 +-
.../solr/handler/component/HttpShardHandler.java | 24 +-
.../handler/component/HttpShardHandlerFactory.java | 174 +-------
.../component/QueryCancellationComponent.java | 104 +++++
.../component/QueryCancellationHandler.java | 108 +++++
.../solr/handler/component/QueryComponent.java | 57 ++-
.../solr/handler/component/ResponseBuilder.java | 40 ++
.../solr/handler/component/SearchHandler.java | 5 +-
.../solr/handler/component/ShardRequest.java | 5 +
.../handler/component/StandaloneReplicaSource.java | 9 +-
.../handler/component/TaskManagementHandler.java | 145 +++++++
.../solr/index/SlowCompositeReaderWrapper.java | 8 +
.../index/UninvertDocValuesMergePolicyFactory.java | 219 ----------
.../src/java/org/apache/solr/pkg/PackageAPI.java | 4 +
.../java/org/apache/solr/query/SolrRangeQuery.java | 33 +-
.../org/apache/solr/request/DocValuesFacets.java | 9 +-
.../org/apache/solr/request/DocValuesStats.java | 10 +-
.../org/apache/solr/request/IntervalFacets.java | 27 +-
.../request/PerSegmentSingleValuedFaceting.java | 15 +-
.../org/apache/solr/request/SolrQueryRequest.java | 10 +
.../apache/solr/request/SolrQueryRequestBase.java | 18 +
.../transform/ChildDocTransformerFactory.java | 17 +-
.../java/org/apache/solr/schema/SchemaField.java | 4 +-
.../src/java/org/apache/solr/search/BitDocSet.java | 145 ++++---
.../java/org/apache/solr/search/CacheConfig.java | 11 +-
.../apache/solr/search/CancellableCollector.java | 77 ++++
.../solr/search/CollapsingQParserPlugin.java | 10 +-
.../src/java/org/apache/solr/search/DocSet.java | 8 +
.../java/org/apache/solr/search/ExtendedQuery.java | 27 +-
.../org/apache/solr/search/ExtendedQueryBase.java | 14 -
.../solr/search/GraphTermsQParserPlugin.java | 30 +-
.../src/java/org/apache/solr/search/Grouping.java | 14 +-
.../src/java/org/apache/solr/search/Insanity.java | 2 +-
.../src/java/org/apache/solr/search/JoinQuery.java | 13 +-
.../org/apache/solr/search/MatchCostQuery.java | 158 +++++++
.../src/java/org/apache/solr/search/QParser.java | 2 -
.../java/org/apache/solr/search/QueryCommand.java | 14 +
.../apache/solr/search/SolrConstantScoreQuery.java | 9 -
.../org/apache/solr/search/SolrIndexSearcher.java | 343 ++++-----------
.../org/apache/solr/search/SortedIntDocSet.java | 219 +++++-----
.../apache/solr/search/facet/SweepCountAware.java | 5 +-
.../org/apache/solr/search/facet/SweepDISI.java | 4 +-
.../solr/search/join/CrossCollectionJoinQuery.java | 14 +-
.../org/apache/solr/search/join/GraphQuery.java | 9 +-
.../apache/solr/security/AllowListUrlChecker.java | 209 +++++++++
.../solr/security/PKIAuthenticationPlugin.java | 43 +-
.../solr/servlet/CheckLoggingConfiguration.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 9 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 68 ++-
.../apache/solr/servlet/SolrRequestParsers.java | 13 +-
.../apache/solr/uninverting/UninvertingReader.java | 2 +-
.../org/apache/solr/update/SolrCmdDistributor.java | 3 +-
.../java/org/apache/solr/update/UpdateCommand.java | 10 +
.../java/org/apache/solr/util/SimplePostTool.java | 2 +-
.../org/apache/solr/util/tracing/GlobalTracer.java | 120 ------
solr/core/src/resources/ImplicitPlugins.json | 14 +
solr/core/src/test-files/krb5-template.conf | 11 +
solr/core/src/test-files/solr/solr-tracing.xml | 57 ---
solr/core/src/test-files/solr/solr.xml | 2 +-
.../test/org/apache/solr/MinimalSchemaTest.java | 3 +-
.../test/org/apache/solr/TestTolerantSearch.java | 4 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 12 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 5 +-
.../apache/solr/cloud/ConfigSetApiLockingTest.java | 124 ++++++
.../solr/cloud/CreateCollectionCleanupTest.java | 2 +-
.../org/apache/solr/cloud/DeleteReplicaTest.java | 2 +-
.../solr/cloud/DistributedApiAsyncTrackerTest.java | 192 +++++++++
.../apache/solr/cloud/KerberosTestServices.java | 18 +-
.../org/apache/solr/cloud/MoveReplicaTest.java | 8 +-
.../apache/solr/cloud/MultiThreadedOCPTest.java | 105 ++---
.../org/apache/solr/cloud/OverseerRolesTest.java | 8 +
.../org/apache/solr/cloud/OverseerStatusTest.java | 4 +
.../test/org/apache/solr/cloud/OverseerTest.java | 29 +-
.../org/apache/solr/cloud/RollingRestartTest.java | 5 +
.../apache/solr/cloud/SaslZkACLProviderTest.java | 8 +
.../solr/cloud/SystemCollectionCompatTest.java | 7 +
.../solr/cloud/TestSkipOverseerOperations.java | 14 +
.../apache/solr/cloud/UnloadDistributedZkTest.java | 8 +-
.../apache/solr/cloud/ZkDistributedLockTest.java | 230 ++++++++++
.../api/collections/CollectionApiLockingTest.java | 149 +++++++
.../CollectionsAPIAsyncDistributedZkTest.java | 24 +-
.../cloud/api/collections/TestCollectionAPI.java | 6 +-
.../TestRequestStatusCollectionAPI.java | 2 +-
.../cluster/placement/AttributeFetcherForTest.java | 5 -
.../impl/PlacementPluginIntegrationTest.java | 17 -
.../src/test/org/apache/solr/core/SOLR749Test.java | 13 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 2 +
.../org/apache/solr/core/TestConfigOverlay.java | 2 +-
.../HdfsBackupRepositoryIntegrationTest.java | 12 +-
.../solr/handler/TestReplicationHandler.java | 21 +
.../TestReplicationHandlerDiskOverFlow.java | 2 +
.../solr/handler/admin/LukeRequestHandlerTest.java | 14 -
.../admin/PropertiesRequestHandlerTest.java | 8 +-
.../apache/solr/handler/admin/TestConfigsApi.java | 2 +-
.../handler/admin/ZookeeperStatusHandlerTest.java | 10 +
.../handler/component/CloudReplicaSourceTest.java | 29 +-
.../component/DistributedDebugComponentTest.java | 4 +-
...WhitelistTest.java => ShardsAllowListTest.java} | 47 +-
.../component/TestHttpShardHandlerFactory.java | 171 +-------
.../index/UninvertDocValuesMergePolicyTest.java | 242 -----------
.../src/test/org/apache/solr/pkg/TestPackages.java | 59 +--
.../solr/schema/TestHalfAndHalfDocValues.java | 131 ------
.../apache/solr/schema/TestManagedSchemaAPI.java | 12 +-
.../apache/solr/search/SolrIndexSearcherTest.java | 9 -
.../solr/search/TestCancellableCollector.java | 234 ++++++++++
.../test/org/apache/solr/search/TestDocSet.java | 162 ++++++-
.../solr/search/TestMaxScoreQueryParser.java | 37 +-
.../org/apache/solr/search/TestSmileRequest.java | 4 +-
.../org/apache/solr/search/TestTaskManagement.java | 264 ++++++++++++
.../solr/search/facet/TestJsonFacetErrors.java | 4 +-
.../solr/search/facet/TestJsonFacetRefinement.java | 4 +-
.../apache/solr/search/facet/TestJsonFacets.java | 4 +-
.../solr/search/facet/TestJsonRangeFacets.java | 4 +-
.../apache/solr/search/json/TestJsonRequest.java | 4 +-
.../solr/security/AllowListUrlCheckerTest.java | 207 +++++++++
.../solr/security/TestPKIAuthenticationPlugin.java | 107 ++---
.../solr/util/tracing/TestDistributedTracing.java | 51 +--
solr/dev-docs/README.adoc | 19 -
solr/docker/Dockerfile | 44 +-
solr/docker/build.gradle | 69 +--
solr/docker/scripts/docker-entrypoint.sh | 4 +-
solr/docker/scripts/solr-create | 2 +-
solr/docker/scripts/solr-demo | 2 +-
solr/docker/scripts/solr-fg | 2 +-
solr/docker/scripts/solr-foreground | 2 +-
solr/docker/scripts/solr-precreate | 4 +-
solr/docker/scripts/start-local-solr | 2 +-
solr/docker/tests/shared.sh | 2 +-
solr/documentation/src/markdown/index.template.md | 2 +-
.../src/markdown/online-link.template.md | 2 +-
solr/licenses/api-common-1.10.1.jar.sha1 | 1 +
solr/licenses/api-common-LICENSE-BSD.txt | 27 ++
solr/licenses/api-common-NOTICE.txt | 0
.../licenses/auto-value-annotations-1.7.4.jar.sha1 | 1 +
.../auto-value-annotations-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/auto-value-annotations-NOTICE.txt | 0
solr/licenses/byte-buddy-1.10.20.jar.sha1 | 1 +
solr/licenses/byte-buddy-1.9.3.jar.sha1 | 1 -
solr/licenses/checker-compat-qual-2.5.5.jar.sha1 | 1 +
solr/licenses/checker-compat-qual-LICENSE-MIT.txt | 5 +
.../error_prone_annotations-2.5.1.jar.sha1 | 1 +
.../error_prone_annotations-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/error_prone_annotations-NOTICE.txt | 0
solr/licenses/failureaccess-1.0.1.jar.sha1 | 1 +
solr/licenses/failureaccess-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/failureaccess-NOTICE.txt | 0
solr/licenses/gax-1.62.0.jar.sha1 | 1 +
solr/licenses/gax-LICENSE-BSD.txt | 27 ++
solr/licenses/gax-NOTICE.txt | 0
solr/licenses/gax-httpjson-0.79.0.jar.sha1 | 1 +
solr/licenses/gax-httpjson-LICENSE-BSD.txt | 27 ++
solr/licenses/gax-httpjson-NOTICE.txt | 0
solr/licenses/google-api-client-1.31.3.jar.sha1 | 1 +
solr/licenses/google-api-client-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-api-client-NOTICE.txt | 0
.../google-api-services-storage-LICENSE-ASL.txt | 202 +++++++++
.../google-api-services-storage-NOTICE.txt | 0
...services-storage-v1-rev20210127-1.31.0.jar.sha1 | 1 +
...google-auth-library-credentials-0.24.1.jar.sha1 | 1 +
...google-auth-library-credentials-LICENSE-BSD.txt | 28 ++
.../google-auth-library-credentials-NOTICE.txt | 0
...google-auth-library-oauth2-http-0.24.1.jar.sha1 | 1 +
...google-auth-library-oauth2-http-LICENSE-BSD.txt | 28 ++
.../google-auth-library-oauth2-http-NOTICE.txt | 0
solr/licenses/google-cloud-core-1.94.3.jar.sha1 | 1 +
solr/licenses/google-cloud-core-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-cloud-core-NOTICE.txt | 0
.../google-cloud-core-http-1.94.3.jar.sha1 | 1 +
.../google-cloud-core-http-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-cloud-core-http-NOTICE.txt | 0
solr/licenses/google-cloud-nio-0.122.11.jar.sha1 | 1 +
solr/licenses/google-cloud-nio-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-cloud-nio-NOTICE.txt | 0
.../google-cloud-storage-1.113.14.jar.sha1 | 1 +
solr/licenses/google-cloud-storage-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-cloud-storage-NOTICE.txt | 0
solr/licenses/google-http-client-1.39.0.jar.sha1 | 1 +
solr/licenses/google-http-client-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-http-client-NOTICE.txt | 0
.../google-http-client-apache-v2-1.39.0.jar.sha1 | 1 +
.../google-http-client-apache-v2-LICENSE-ASL.txt | 202 +++++++++
.../google-http-client-apache-v2-NOTICE.txt | 0
.../google-http-client-appengine-1.39.0.jar.sha1 | 1 +
.../google-http-client-appengine-LICENSE-ASL.txt | 202 +++++++++
.../google-http-client-appengine-NOTICE.txt | 0
.../google-http-client-gson-1.39.0.jar.sha1 | 1 +
.../google-http-client-jackson2-1.39.0.jar.sha1 | 1 +
.../google-http-client-jackson2-LICENSE-ASL.txt | 202 +++++++++
.../google-http-client-jackson2-NOTICE.txt | 0
solr/licenses/google-oauth-client-1.31.4.jar.sha1 | 1 +
solr/licenses/google-oauth-client-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/google-oauth-client-NOTICE.txt | 0
solr/licenses/grpc-context-1.36.0.jar.sha1 | 1 +
solr/licenses/grpc-context-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/grpc-context-NOTICE.txt | 62 +++
solr/licenses/gson-2.8.6.jar.sha1 | 1 +
solr/licenses/gson-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/gson-NOTICE.txt | 0
solr/licenses/httpcore-4.4.13.jar.sha1 | 1 -
solr/licenses/httpcore-4.4.14.jar.sha1 | 1 +
solr/licenses/j2objc-annotations-1.3.jar.sha1 | 1 +
solr/licenses/j2objc-annotations-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/j2objc-annotations-NOTICE.txt | 0
solr/licenses/jackson-annotations-2.10.1.jar.sha1 | 1 -
solr/licenses/jackson-annotations-2.12.2.jar.sha1 | 1 +
solr/licenses/jackson-core-2.10.1.jar.sha1 | 1 -
solr/licenses/jackson-core-2.12.2.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.10.1.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.12.2.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.10.1.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.12.2.jar.sha1 | 1 +
solr/licenses/javax.annotation-api-1.3.2.jar.sha1 | 1 +
.../licenses/javax.annotation-api-LICENSE-CDDL.txt | 362 ++++++++++++++++
solr/licenses/javax.inject-1.jar.sha1 | 1 +
solr/licenses/javax.inject-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/javax.inject-NOTICE.txt | 0
solr/licenses/jsr305-3.0.2.jar.sha1 | 1 +
solr/licenses/jsr305-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/jsr305-NOTICE.txt | 0
...9.0-empty-to-avoid-conflict-with-guava.jar.sha1 | 1 +
solr/licenses/listenablefuture-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/listenablefuture-NOTICE.txt | 0
solr/licenses/mockito-core-2.23.4.jar.sha1 | 1 -
solr/licenses/mockito-core-3.8.0.jar.sha1 | 1 +
solr/licenses/objenesis-2.6.jar.sha1 | 1 -
solr/licenses/objenesis-3.1.jar.sha1 | 1 +
solr/licenses/opencensus-api-0.28.0.jar.sha1 | 1 +
solr/licenses/opencensus-api-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/opencensus-api-NOTICE.txt | 0
.../opencensus-contrib-http-util-0.28.0.jar.sha1 | 1 +
.../opencensus-contrib-http-util-LICENSE-ASL.txt | 202 +++++++++
.../opencensus-contrib-http-util-NOTICE.txt | 0
.../proto-google-common-protos-2.1.0.jar.sha1 | 1 +
.../proto-google-common-protos-LICENSE-ASL.txt | 202 +++++++++
.../licenses/proto-google-common-protos-NOTICE.txt | 0
solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1 | 1 +
solr/licenses/proto-google-iam-v1-LICENSE-ASL.txt | 202 +++++++++
solr/licenses/proto-google-iam-v1-NOTICE.txt | 0
solr/licenses/protobuf-java-3.11.0.jar.sha1 | 1 -
solr/licenses/protobuf-java-3.15.5.jar.sha1 | 1 +
solr/licenses/protobuf-java-util-3.15.5.jar.sha1 | 1 +
solr/licenses/threetenbp-1.5.0.jar.sha1 | 1 +
solr/licenses/threetenbp-LICENSE-BSD.txt | 29 ++
solr/licenses/threetenbp-NOTICE.txt | 0
solr/packaging/build.gradle | 56 +++
solr/server/etc/security.properties | 2 +-
solr/server/solr/solr.xml | 3 +-
.../src/analytics-expression-sources.adoc | 4 +-
.../src/analytics-mapping-functions.adoc | 344 +++++++--------
.../src/analytics-reduction-functions.adoc | 33 +-
.../src/basic-authentication-plugin.adoc | 10 +
solr/solr-ref-guide/src/collection-aliasing.adoc | 329 +++++++-------
solr/solr-ref-guide/src/collection-management.adoc | 312 ++------------
solr/solr-ref-guide/src/collections-api.adoc | 104 ++++-
.../solr-ref-guide/src/command-line-utilities.adoc | 2 +-
.../src/common-query-parameters.adoc | 14 +
solr/solr-ref-guide/src/distributed-requests.adoc | 15 +-
.../distributed-search-with-index-sharding.adoc | 4 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 4 +-
solr/solr-ref-guide/src/faceting.adoc | 6 +-
.../src/field-type-definitions-and-properties.adoc | 2 +-
solr/solr-ref-guide/src/filter-descriptions.adoc | 30 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 11 +-
solr/solr-ref-guide/src/images/icons/favicon.ico | Bin 3262 -> 2350 bytes
solr/solr-ref-guide/src/index.adoc | 3 +
.../src/indexconfig-in-solrconfig.adoc | 3 +-
solr/solr-ref-guide/src/language-analysis.adoc | 8 +-
.../src/major-changes-in-solr-8.adoc | 4 +-
.../src/major-changes-in-solr-9.adoc | 14 +
.../src/making-and-restoring-backups.adoc | 191 ++++++++-
solr/solr-ref-guide/src/post-tool.adoc | 2 +
solr/solr-ref-guide/src/replica-management.adoc | 355 +++++++++-------
solr/solr-ref-guide/src/shard-management.adoc | 283 ++++++++-----
.../src/solr-control-script-reference.adoc | 4 +-
.../src/solr-jdbc-apache-zeppelin.adoc | 2 +-
.../src/solr-jdbc-python-jython.adoc | 4 +-
solr/solr-ref-guide/src/solr-tracing.adoc | 97 +----
solr/solr-ref-guide/src/task-management.adoc | 66 +++
solr/solr-ref-guide/src/the-terms-component.adoc | 16 -
.../solrj/impl/SolrClientNodeStateProvider.java | 3 -
.../solrj/request/CollectionAdminRequest.java | 59 ++-
.../solr/client/solrj/response/QueryResponse.java | 24 ++
.../org/apache/solr/common/cloud/ClusterState.java | 31 +-
.../apache/solr/common/cloud/ZkStateReader.java | 3 -
.../solr/common/cloud/rule/ImplicitSnitch.java | 1 -
.../solr/common/params/CollectionParams.java | 6 +-
.../apache/solr/common/params/CommonParams.java | 15 +
.../org/apache/solr/common/params/ShardParams.java | 3 +
.../org/apache/solr/common/util/ExecutorUtil.java | 8 +
.../src/resources/apispec/core.tasks.cancel.json | 18 +
.../src/resources/apispec/core.tasks.list.json | 12 +
solr/solrj/src/test-files/solrj/solr/solr.xml | 2 +-
.../apache/solr/client/solrj/SolrExampleTests.java | 18 +-
.../solr/client/solrj/io/stream/StreamingTest.java | 12 +-
.../apache/solr/BaseDistributedSearchTestCase.java | 4 +-
.../src/java/org/apache/solr/SolrTestCaseHS.java | 7 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 46 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 6 +-
.../org/apache/solr/cloud/SolrCloudTestCase.java | 52 ++-
.../collections/AbstractBackupRepositoryTest.java | 251 ++++++++---
.../collections/AbstractIncrementalBackupTest.java | 1 +
solr/webapp/web/favicon.ico | Bin 3262 -> 0 bytes
solr/webapp/web/img/favicon.ico | Bin 3262 -> 2350 bytes
solr/webapp/web/partials/core_overview.html | 3 -
versions.lock | 64 ++-
versions.props | 228 +++++-----
424 files changed, 15744 insertions(+), 5056 deletions(-)
diff --cc solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
index f8f5635,90e36c5..a3adcf3
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
@@@ -90,10 -85,11 +92,12 @@@ public class TestCollectionAPI extends
clusterStatusWithCollection();
clusterStatusWithCollectionAndShard();
clusterStatusWithCollectionAndMultipleShards();
+ clusterStatusWithCollectionHealthState();
clusterStatusWithRouteKey();
clusterStatusAliasTest();
- clusterStatusRolesTest();
+ if (!isDistributedCollectionApi) {
+ clusterStatusRolesTest();
+ }
clusterStatusBadCollectionTest();
replicaPropTest();
clusterStatusZNodeVersion();