You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2021/04/26 13:41:05 UTC
[solr] branch solr-14166-twoPhaseIterator-v2 updated (06d42de ->
6c5090f)
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch solr-14166-twoPhaseIterator-v2
in repository https://gitbox.apache.org/repos/asf/solr.git.
from 06d42de Merge branch 'solr-14166-twoPhaseIterator' into solr-14166-twoPhaseIterator-v2
add 291f9b3 SOLR-15288: Hardening NODEDOWN event event in PRS mode
add 59a5913 SOLR-11921: Move "cursorMark" logic from QueryComponent to SearchHandler so it can work with things like QueryElevationComponent that modify the SortSpec in prepare(), as well as possible custom "search" components other then QueryComponent
add def7f47 SOLR-15233: Set doAs in ConfigurableInternodeAuthHadoopPlugin
add 06fad78 SOLR-13608: Sync on TrackingBackupRepo NL changes (#59)
add 2e4ddc7 SOLR-15249 Attempt to repair security.json ACLs
add c8ef5e9 SOLR-15249 Update unit test
add df5d0f3 Correct the JDK-17 offending javadocs
add 956b021 Check For SVN in release wizard (#61)
add 440d4ba SOLR-14916: Add split parameter to timeseries Streaming Expression
add 51e749d SOLR-15157: rename getShardHandler into newShardHandler in CollectionCommandContext (#62)
add 27c66a3 SOLR-15002 Upgrade httpclient to 4.5.13 and httpcore to 4.4.13 (#27)
add 23e277b fix 2 typos in help/validateLogCalls.txt
add 08d7f05 fix 'succes[s]ful' typo in a RecoveryStrategy error log message
add adf9e6d SOLR-15327: Fix typos spread in code base (#65)
add 7ac95ab SOLR-15317 Handle spaces in principal names (#64)
add ddf9dc7 SOLR-15288: fix DOWNNODE issue for PRS collections when cluster state updates are distributed (#71)
add 963a81d SOLR-15169 SolrPaths.assertPathAllowed normalization problem (#22)
add 85d9346 DOAP changes for release 8.8.2
add 5157b48 Sync CHANGES for 8.8.2
add e4dc033 SOLR-15322: Solr releases now contain everything needed to build runable docker images
add aa4c4d3 SOLR-15164: Implement Task Management Interface (#76)
add b8b65ce SOLR-15164: Add CHANGES.txt entry for SOLR-15164
add 04ad095 SOLR-12930: Simplify and Organize Developer Docs (#69)
add c83f983 SOLR-15341: Lucene has removed CodecReader#ramBytesUsed, so this is n… (#77)
add a8706b4 SOLR-15153 - Collection selector drop down does not sort collections (#63)
add b574364 document handling central versus private branches (#79)
add 450a5a4 SOLR-15328: include time-taken in finished-recovery-process logging (#66)
add 4a78b45 SOLR-15146: Collection and Config Set API can run distributed on all nodes (#70)
add 749af1b SOLR-15334 Return error response when failing auth in PKIAuthPlugin (#75)
add 72a9948 SOLR-15155: Document how to set credentials in CloudHttp2SolrClient (#51)
add bec4ed8 SOLR-14185: introduce DocSet.iterator(LeafReaderContext), replacing Filter where possible (#2)
add 0f3893b Remove archive-solr-ref-guide.sh script which has not been needed since we switched from 'releasing' ref-guide PDFs to just hosting the docs on the website
add d6ff3dd SOLR-15356: MergeIndexes should not use UninvertingReader. (#84)
add 8ad07a2 SOLR-15356: Remove UninvertDocValuesMergePolicyFactory(#83)
add 3672c33 SOLR-15361: Add gpg signing of the tgz & zip distribution files
add 7877c91 SOLR-15341: indexHeapUsageBytes is no longer populated
add 0a11a8b precommit fix: import statements
add fea2b1a Replace http URLs with https (#85)
add e843d82 SOLR-15363 Add CompletableFuture#runAsync to forbidden-api (#86)
add 69b4187 SOLR-15283 Tracing overhaul (#52)
add 9e27c37 SOLR-15329 Improve hdfs directory size calculation
add 251eb2c SOLR-15366 Add debug output
add 67772018 Revert "SOLR-15361: Add gpg signing of the tgz & zip distribution files"
add 7103731 SOLR-11646: document v2 api (WIP) (#41)
add 2159cad SOLR-15334 Check for Mockito before using it
add f5f9dee SOLR-15366 Allow weak crypto for KRB tests
add d0adf4d SOLR-15334 NPE when test is ignored
add fc04ba8 Update gradle to 6.8.3 (#89)
add 798ea7a CHANGES.txt fix wrong JIRA reference and add my name
add 1adedf5 SOLR-15067: Child doc transformer should use the perSegFilter cache (#92)
add 6c5090f Merge branch 'solr_main' into solr-14166-twoPhaseIterator-v2
No new revisions were added by this update.
Summary of changes:
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 | 12 +-
dev-tools/scripts/releaseWizard.yaml | 135 +-----
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/wrapper/gradle-wrapper.jar.version | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
help/validateLogCalls.txt | 2 +-
solr/CHANGES.txt | 66 ++-
solr/README.md | 6 +-
solr/bin/install_solr_service.sh | 2 +-
solr/bin/post | 4 +-
solr/bin/solr | 2 +-
...ExtractNamedEntitiesUpdateProcessorFactory.java | 2 +-
.../analytics/function/mapping/LambdaFunction.java | 6 -
solr/contrib/extraction/README.md | 4 +-
.../extraction/ExtractingDocumentLoader.java | 2 +-
solr/contrib/jaegertracer-configurator/README.md | 34 +-
.../contrib/jaegertracer-configurator/build.gradle | 2 +-
.../solr/jaeger/JaegerTracerConfigurator.java | 56 +--
.../src/test-files/solr/solr.xml | 8 +-
.../apache/solr/jaeger/TestJaegerConfigurator.java | 106 ++---
...angDetectLanguageIdentifierUpdateProcessor.java | 5 +-
solr/core/build.gradle | 2 +-
.../apache/solr/cloud/ConfigSetApiLockFactory.java | 54 +++
.../java/org/apache/solr/cloud/ConfigSetCmds.java | 218 ++++++++++
.../solr/cloud/DistributedApiAsyncTracker.java | 355 ++++++++++++++++
.../solr/cloud/DistributedClusterStateUpdater.java | 10 +-
.../cloud/DistributedCollectionLockFactory.java | 53 +++
.../cloud/DistributedConfigSetLockFactory.java | 41 ++
.../org/apache/solr/cloud/DistributedLock.java} | 24 +-
.../apache/solr/cloud/DistributedMultiLock.java | 76 ++++
.../src/java/org/apache/solr/cloud/Overseer.java | 2 +-
.../cloud/OverseerConfigSetMessageHandler.java | 182 +-------
.../org/apache/solr/cloud/RecoveryStrategy.java | 8 +-
.../solr/cloud/SizeLimitedDistributedMap.java | 28 +-
.../java/org/apache/solr/cloud/ZkController.java | 37 +-
.../cloud/ZkDistributedCollectionLockFactory.java | 100 +++++
.../cloud/ZkDistributedConfigSetLockFactory.java | 60 +++
.../org/apache/solr/cloud/ZkDistributedLock.java | 234 ++++++++++
.../solr/cloud/ZkDistributedLockFactory.java | 66 +++
.../solr/cloud/api/collections/AddReplicaCmd.java | 2 +-
.../solr/cloud/api/collections/BackupCmd.java | 4 +-
.../solr/cloud/api/collections/CollApiCmds.java | 85 +++-
.../api/collections/CollectionApiLockFactory.java | 111 +++++
.../api/collections/CollectionCommandContext.java | 16 +-
.../api/collections/CollectionHandlingUtils.java | 4 +-
.../cloud/api/collections/CreateCollectionCmd.java | 17 +-
.../cloud/api/collections/CreateSnapshotCmd.java | 2 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 2 +-
.../cloud/api/collections/DeleteReplicaCmd.java | 2 +-
.../cloud/api/collections/DeleteSnapshotCmd.java | 2 +-
...va => DistributedCollectionCommandContext.java} | 67 ++-
...istributedCollectionConfigSetCommandRunner.java | 471 +++++++++++++++++++++
.../api/collections/MaintainRoutedAliasCmd.java | 6 +-
.../solr/cloud/api/collections/MigrateCmd.java | 2 +-
.../collections/OcmhCollectionCommandContext.java | 7 +-
.../OverseerCollectionMessageHandler.java | 50 +--
.../cloud/api/collections/OverseerRoleCmd.java | 5 +
.../cloud/api/collections/OverseerStatusCmd.java | 23 +-
.../solr/cloud/api/collections/RestoreCmd.java | 2 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 2 +-
.../apache/solr/cloud/overseer/NodeMutator.java | 18 +-
.../apache/solr/core/CancellableQueryTracker.java | 107 +++++
.../src/java/org/apache/solr/core/CloudConfig.java | 22 +-
.../java/org/apache/solr/core/CoreContainer.java | 76 +++-
.../org/apache/solr/core/HdfsDirectoryFactory.java | 2 -
.../src/java/org/apache/solr/core/SolrCore.java | 9 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 3 +
.../org/apache/solr/core/TracerConfigurator.java | 96 +++--
.../backup/repository/BackupRepositoryFactory.java | 12 +-
.../java/org/apache/solr/handler/ClusterAPI.java | 4 +-
.../solr/handler/admin/CollectionsHandler.java | 271 +++++++-----
.../solr/handler/admin/ConfigSetsHandler.java | 42 +-
.../solr/handler/admin/LukeRequestHandler.java | 2 +-
.../apache/solr/handler/admin/MergeIndexesOp.java | 2 +-
.../solr/handler/admin/RebalanceLeaders.java | 8 +-
.../handler/admin/SegmentsInfoRequestHandler.java | 64 +--
.../component/ActiveTasksListComponent.java | 117 +++++
.../handler/component/ActiveTasksListHandler.java | 105 +++++
.../solr/handler/component/HttpShardHandler.java | 7 +-
.../component/QueryCancellationComponent.java | 104 +++++
.../component/QueryCancellationHandler.java | 108 +++++
.../solr/handler/component/QueryComponent.java | 67 ++-
.../handler/component/RealTimeGetComponent.java | 28 +-
.../solr/handler/component/ResponseBuilder.java | 40 ++
.../solr/handler/component/SearchHandler.java | 19 +-
.../solr/handler/component/ShardRequest.java | 5 +
.../apache/solr/handler/component/StatsField.java | 8 +-
.../handler/component/TaskManagementHandler.java | 145 +++++++
.../index/UninvertDocValuesMergePolicyFactory.java | 219 ----------
.../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 +-
.../src/java/org/apache/solr/schema/FieldType.java | 8 +-
.../src/java/org/apache/solr/schema/TextField.java | 2 +-
.../src/java/org/apache/solr/search/BitDocSet.java | 145 ++++---
.../apache/solr/search/CancellableCollector.java | 77 ++++
.../java/org/apache/solr/search/CursorMark.java | 17 +-
.../java/org/apache/solr/search/DocListAndSet.java | 2 -
.../src/java/org/apache/solr/search/DocSet.java | 8 +
.../solr/search/GraphTermsQParserPlugin.java | 13 +-
.../src/java/org/apache/solr/search/JoinQuery.java | 13 +-
.../java/org/apache/solr/search/QueryCommand.java | 14 +
.../java/org/apache/solr/search/ReturnFields.java | 2 -
.../org/apache/solr/search/SolrIndexSearcher.java | 15 +-
.../org/apache/solr/search/SortedIntDocSet.java | 219 +++++-----
.../apache/solr/search/facet/SweepCountAware.java | 5 +-
.../org/apache/solr/search/facet/SweepDISI.java | 4 +-
.../distance/GeohashHaversineFunction.java | 1 -
.../solr/search/join/CrossCollectionJoinQuery.java | 14 +-
.../org/apache/solr/search/join/GraphQuery.java | 9 +-
.../ConfigurableInternodeAuthHadoopPlugin.java | 67 ++-
.../org/apache/solr/security/HadoopAuthPlugin.java | 13 +-
.../org/apache/solr/security/KerberosPlugin.java | 22 +-
.../solr/security/PKIAuthenticationPlugin.java | 51 +--
.../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 +-
.../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 +
...-psuedo-fields.xml => schema-pseudo-fields.xml} | 2 +-
.../solr/collection1/conf/schema-trie.xml | 4 +-
.../test-files/solr/collection1/conf/schema11.xml | 4 +-
.../test-files/solr/collection1/conf/schema12.xml | 2 +-
.../solr/collection1/conf/schema_latest.xml | 2 +-
.../collection1/conf/solrconfig-deeppaging.xml | 15 +
...rconfig-uninvertdocvaluesmergepolicyfactory.xml | 38 --
.../security/hadoop_kerberos_authz_config.json | 15 +-
solr/core/src/test-files/solr/solr-tracing.xml | 57 ---
.../src/test/org/apache/solr/CursorPagingTest.java | 180 +++++++-
.../test/org/apache/solr/MinimalSchemaTest.java | 3 +-
.../solr/TestCursorMarkWithoutUniqueKey.java | 5 +-
.../client/solrj/impl/Krb5HttpClientUtils.java | 66 +++
.../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 +-
.../apache/solr/cloud/DistribCursorPagingTest.java | 220 +++++++---
.../solr/cloud/DistributedApiAsyncTrackerTest.java | 192 +++++++++
.../apache/solr/cloud/KerberosTestServices.java | 1 +
.../org/apache/solr/cloud/MoveReplicaTest.java | 8 +-
.../apache/solr/cloud/MultiThreadedOCPTest.java | 105 ++---
.../org/apache/solr/cloud/NodeMutatorTest.java | 2 +-
.../org/apache/solr/cloud/OverseerRolesTest.java | 8 +
.../org/apache/solr/cloud/OverseerStatusTest.java | 4 +
.../test/org/apache/solr/cloud/OverseerTest.java | 5 +-
.../org/apache/solr/cloud/RollingRestartTest.java | 5 +
.../apache/solr/cloud/SaslZkACLProviderTest.java | 3 +
.../solr/cloud/SystemCollectionCompatTest.java | 7 +
.../solr/cloud/TestCloudPseudoReturnFields.java | 8 +-
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 2 +-
.../solr/cloud/TestSkipOverseerOperations.java | 14 +
.../VMParamsZkACLAndCredentialsProvidersTest.java | 30 +-
.../apache/solr/cloud/ZkDistributedLockTest.java | 230 ++++++++++
.../api/collections/CollectionApiLockingTest.java | 149 +++++++
.../CollectionsAPIAsyncDistributedZkTest.java | 24 +-
.../cloud/api/collections/TestCollectionAPI.java | 6 +-
.../TestRequestStatusCollectionAPI.java | 2 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 2 +
.../org/apache/solr/core/TestCoreContainer.java | 22 +
.../solr/handler/admin/LukeRequestHandlerTest.java | 14 -
.../apache/solr/handler/admin/TestConfigsApi.java | 2 +-
.../solr/handler/component/BadComponentTest.java | 6 +
.../component/QueryElevationComponentTest.java | 101 +++++
.../index/UninvertDocValuesMergePolicyTest.java | 242 -----------
.../solr/schema/TestHalfAndHalfDocValues.java | 131 ------
.../apache/solr/schema/TestManagedSchemaAPI.java | 12 +-
.../org/apache/solr/search/CursorMarkTest.java | 20 +-
.../solr/search/TestCancellableCollector.java | 234 ++++++++++
.../test/org/apache/solr/search/TestDocSet.java | 156 ++++++-
.../solr/search/TestExtendedDismaxParser.java | 2 +-
.../apache/solr/search/TestPseudoReturnFields.java | 6 +-
.../org/apache/solr/search/TestTaskManagement.java | 259 +++++++++++
.../search/facet/TestCloudJSONFacetJoinDomain.java | 2 +-
.../search/facet/TestCloudJSONFacetSKGEquiv.java | 2 +-
.../solr/security/TestPKIAuthenticationPlugin.java | 121 +++---
.../apache/solr/security/hadoop/KerberosUtils.java | 3 +-
.../TestRuleBasedAuthorizationWithKerberos.java | 51 ++-
.../hadoop/TestSolrCloudWithHadoopAuthPlugin.java | 7 +-
.../security/hadoop/TestZkAclsWithHadoopAuth.java | 4 +-
.../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/httpclient-4.5.10.jar.sha1 | 1 -
solr/licenses/httpclient-4.5.13.jar.sha1 | 1 +
solr/licenses/httpcore-4.4.12.jar.sha1 | 1 -
solr/licenses/httpcore-4.4.13.jar.sha1 | 1 +
solr/packaging/build.gradle | 9 +
.../conf/managed-schema | 2 +-
solr/server/solr/solr.xml | 1 +
.../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 ++++-
.../src/common-query-parameters.adoc | 14 +
.../src/documents-fields-and-schema-design.adoc | 2 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 4 +-
solr/solr-ref-guide/src/filter-descriptions.adoc | 2 +-
.../src/hadoop-authentication-plugin.adoc | 10 +
solr/solr-ref-guide/src/index.adoc | 3 +
.../src/indexconfig-in-solrconfig.adoc | 3 +-
.../src/indexing-nested-documents.adoc | 6 +-
.../src/major-changes-in-solr-9.adoc | 12 +
solr/solr-ref-guide/src/replica-management.adoc | 355 +++++++++-------
.../src/searching-nested-documents.adoc | 2 +-
solr/solr-ref-guide/src/shard-management.adoc | 283 ++++++++-----
.../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 +++
.../src/transforming-result-documents.adoc | 4 +-
.../src/updating-parts-of-documents.adoc | 6 +-
solr/solr-ref-guide/tools/BuildNavDataFiles.java | 2 +-
.../solr-ref-guide/tools/CheckLinksAndAnchors.java | 22 +-
.../org/apache/solr/client/solrj/SolrQuery.java | 1 -
.../client/solrj/impl/Krb5HttpClientBuilder.java | 13 +-
.../solr/client/solrj/io/stream/RandomStream.java | 2 +-
.../client/solrj/io/stream/TimeSeriesStream.java | 178 ++++++--
.../solrj/request/CollectionAdminRequest.java | 59 ++-
.../solr/client/solrj/response/QueryResponse.java | 24 ++
.../common/cloud/SecurityAwareZkACLProvider.java | 2 +-
.../apache/solr/common/cloud/ZkStateReader.java | 3 -
.../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 +
.../IndexingNestedDocuments.java | 2 +-
.../apache/solr/client/solrj/SolrExampleTests.java | 44 +-
.../client/solrj/impl/CloudSolrClientTest.java | 43 --
.../solrj/io/stream/StreamExpressionTest.java | 273 +++++++++++-
.../cloud/PerReplicaStatesIntegrationTest.java | 158 +++++++
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 34 ++
.../apache/solr/cloud/MiniSolrCloudCluster.java | 1 +
.../org/apache/solr/cloud/SolrCloudTestCase.java | 52 ++-
.../java/org/apache/solr/util/SSLTestConfig.java | 10 +-
versions.lock | 4 +-
versions.props | 4 +-
281 files changed, 8129 insertions(+), 3972 deletions(-)
create mode 100644 dev-docs/FAQ.adoc
rename dev-docs/{dev-utilities.adoc => cloud-script.adoc} (53%)
rename {solr/dev-docs => dev-docs}/overseer/images/configSet-processor-flow.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/images/locking-levels.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/images/session-lockTree-20nodes.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/images/session-lockTree1.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/images/session-lockTree2.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/images/single-thread-clusterstate-updater.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/images/state-change-steps.png (100%)
rename {solr/dev-docs => dev-docs}/overseer/overseer.adoc (100%)
delete mode 100755 dev-tools/scripts/addBackcompatIndexes.py
delete mode 100755 dev-tools/scripts/archive-solr-ref-guide.sh
rename {solr/cloud-dev => dev-tools/scripts}/cloud.sh (96%)
mode change 100644 => 100755
delete mode 100644 gradle/validation/forbidden-apis/defaults.lucene.txt
delete mode 100644 gradle/validation/forbidden-apis/defaults.solr.txt
create mode 100644 solr/core/src/java/org/apache/solr/cloud/ConfigSetApiLockFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/ConfigSetCmds.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/DistributedCollectionLockFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/DistributedConfigSetLockFactory.java
rename solr/{test-framework/src/java/org/apache/solr/core/MockTracerConfigurator.java => core/src/java/org/apache/solr/cloud/DistributedLock.java} (68%)
create mode 100644 solr/core/src/java/org/apache/solr/cloud/DistributedMultiLock.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/ZkDistributedCollectionLockFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/ZkDistributedConfigSetLockFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/ZkDistributedLock.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/ZkDistributedLockFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionApiLockFactory.java
copy solr/core/src/java/org/apache/solr/cloud/api/collections/{OcmhCollectionCommandContext.java => DistributedCollectionCommandContext.java} (52%)
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
create mode 100644 solr/core/src/java/org/apache/solr/core/CancellableQueryTracker.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/component/ActiveTasksListComponent.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/component/ActiveTasksListHandler.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/component/QueryCancellationComponent.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/component/QueryCancellationHandler.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/component/TaskManagementHandler.java
delete mode 100644 solr/core/src/java/org/apache/solr/index/UninvertDocValuesMergePolicyFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/search/CancellableCollector.java
delete mode 100644 solr/core/src/java/org/apache/solr/util/tracing/GlobalTracer.java
create mode 100644 solr/core/src/test-files/krb5-template.conf
rename solr/core/src/test-files/solr/collection1/conf/{schema-psuedo-fields.xml => schema-pseudo-fields.xml} (98%)
delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
delete mode 100644 solr/core/src/test-files/solr/solr-tracing.xml
create mode 100644 solr/core/src/test/org/apache/solr/client/solrj/impl/Krb5HttpClientUtils.java
create mode 100644 solr/core/src/test/org/apache/solr/cloud/ConfigSetApiLockingTest.java
create mode 100644 solr/core/src/test/org/apache/solr/cloud/DistributedApiAsyncTrackerTest.java
create mode 100644 solr/core/src/test/org/apache/solr/cloud/ZkDistributedLockTest.java
create mode 100644 solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionApiLockingTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/index/UninvertDocValuesMergePolicyTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
create mode 100644 solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java
create mode 100644 solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
delete mode 100644 solr/dev-docs/README.adoc
delete mode 100644 solr/licenses/httpclient-4.5.10.jar.sha1
create mode 100644 solr/licenses/httpclient-4.5.13.jar.sha1
delete mode 100644 solr/licenses/httpcore-4.4.12.jar.sha1
create mode 100644 solr/licenses/httpcore-4.4.13.jar.sha1
create mode 100644 solr/solr-ref-guide/src/task-management.adoc
create mode 100644 solr/solrj/src/resources/apispec/core.tasks.cancel.json
create mode 100644 solr/solrj/src/resources/apispec/core.tasks.list.json
create mode 100644 solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java