You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/12/10 23:36:16 UTC

[lucene-solr] branch reference_impl updated (cc009b2 -> b74fac9)

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from cc009b2  @1223 Keep live nodes forward momentum.
     add b38bd7b  @1224 Some work on replace node command and a bit on delete node.
     add 12b7911  @1225 Bump max connections per host.
     add 6157f61  @1226 Cleanup unused imports.
     add a96f7e6  @1227 Tweak core state locking.
     add 02e3a6e  @1228 Tweaks.
     add 607c28a  @1229 Make sure recovery can bail from it's longer retries.
     add 61105ed  @1230 Fast response to close.
     add 12fee22  @1231 Fix NPE in test.
     add 0e9826b  @1232 Send the recovery lock into the recovery strat.
     add c2d7e90  @1233 Close elector should only be in unload not solrcore#close.
     add d5db80d  @1234 Cut unused dist queue stuff.
     add caea02d  @1235 Cleanup logging, Overseer close.
     add 7c0e762  @1236 Logging cleanup.
     add 123c2fc  Un-ignore tests in org.apache.solr.handler.admin package
     add 157acc2  @1237 Add a way to start bringing in non Nightly ssl specific tests.
     add b96703c  Re-enable TestRequestStatusCollectionAPI
     add 39eba03  @1238 Fix up SolrCore ref count stuff.
     add b74fac9  @1239 Prep First Hand. Where is that 100-Type Guanyin Bodhisattva at?

No new revisions were added by this update.

Summary of changes:
 .../apache/lucene/missingdoclet/MissingDoclet.java |    2 -
 gradle/testing/defaults-tests.gradle               |    4 +-
 .../apache/lucene/store/NativeFSLockFactory.java   |    2 +-
 .../lucene/monitor/ForceNoBulkScoringQuery.java    |    1 -
 .../lucene/search/suggest/tst/TSTLookup.java       |    1 -
 .../org/apache/lucene/analysis/MockTokenizer.java  |    7 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |    8 +-
 solr/cloud-dev/cloud.sh                            |    4 +-
 .../stream/AnalyticsShardRequestManager.java       |    3 +-
 .../solr/analytics/ExpressionFactoryTest.java      |   13 +-
 .../function/field/AbstractAnalyticsFieldTest.java |   18 +
 .../legacy/LegacyAbstractAnalyticsTest.java        |    8 +-
 .../solr/analytics/legacy/LegacyNoFacetTest.java   |   18 +
 .../facet/LegacyAbstractAnalyticsFacetTest.java    |   46 +-
 .../legacy/facet/LegacyFieldFacetExtrasTest.java   |    9 +
 .../legacy/facet/LegacyFieldFacetTest.java         |   48 +
 .../legacy/facet/LegacyRangeFacetTest.java         |   14 +
 .../solr/handler/dataimport/DataImportHandler.java |   13 +-
 .../solr/handler/dataimport/DataImporter.java      |   23 +-
 .../solr/handler/dataimport/XPathRecordReader.java |   25 +-
 .../dataimport/TestContentStreamDataSource.java    |    1 -
 .../dataimport/TestHierarchicalDocBuilder.java     |    2 +-
 .../dataimport/TestJdbcDataSourceConvertType.java  |   14 +-
 .../handler/dataimport/TestScriptTransformer.java  |    2 +-
 .../TestSolrEntityProcessorEndToEnd.java           |    1 -
 .../extraction/ExtractingDocumentLoader.java       |    4 +-
 .../handler/extraction/ParseContextConfigTest.java |    8 +-
 .../apache/solr/ltr/model/DefaultWrapperModel.java |   13 +-
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java    |    5 +-
 .../org/apache/solr/ltr/TestLTRQParserPlugin.java  |   20 +-
 .../apache/solr/ltr/TestLTRReRankingPipeline.java  |   22 +-
 .../org/apache/solr/ltr/TestLTRScoringQuery.java   |   49 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |   66 +-
 .../solr/ltr/TestSelectiveWeightCreation.java      |   36 +-
 .../solr/ltr/feature/TestExternalFeatures.java     |   34 +-
 .../ltr/feature/TestExternalValueFeatures.java     |   30 +-
 .../TestFeatureExtractionFromMultipleSegments.java |   53 +-
 .../solr/ltr/feature/TestOriginalScoreFeature.java |    4 +-
 .../org/apache/solr/ltr/model/TestLinearModel.java |   15 +-
 .../solr/ltr/model/TestNeuralNetworkModel.java     |    2 +-
 .../apache/solr/ltr/norm/TestMinMaxNormalizer.java |   22 +-
 .../solr/ltr/norm/TestStandardNormalizer.java      |   21 +-
 .../solr/ltr/store/rest/TestModelManager.java      |   57 +-
 .../store/rest/TestModelManagerPersistence.java    |    2 +-
 .../collector/SchedulerMetricsCollector.java       |    3 +-
 .../prometheus/exporter/MetricsConfiguration.java  |    1 -
 .../solr/prometheus/exporter/MetricsQuery.java     |    1 -
 .../exporter/PrometheusExporterSettings.java       |    1 -
 .../prometheus/exporter/SolrClientFactory.java     |    1 -
 .../solr/prometheus/exporter/SolrExporter.java     |    3 +-
 .../solr/prometheus/scraper/SolrCloudScraper.java  |    1 -
 .../prometheus/scraper/SolrStandaloneScraper.java  |    1 -
 .../prometheus/PrometheusExporterTestBase.java     |    1 -
 .../prometheus/scraper/SolrCloudScraperTest.java   |    2 +-
 .../scraper/SolrStandaloneScraperTest.java         |   45 +-
 solr/core/src/java/org/apache/solr/api/ApiBag.java |    4 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |    2 +-
 .../solr/client/solrj/embedded/JettyConfig.java    |    1 -
 .../client/solrj/embedded/JettySolrRunner.java     |  252 ++-
 .../apache/solr/cloud/CloudConfigSetService.java   |    7 +-
 .../org/apache/solr/cloud/CloudDescriptor.java     |   11 -
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |   22 +-
 .../java/org/apache/solr/cloud/DistributedMap.java |    3 +-
 .../org/apache/solr/cloud/ElectionContext.java     |   10 +-
 .../java/org/apache/solr/cloud/LeaderElector.java  |  399 ++--
 .../src/java/org/apache/solr/cloud/Overseer.java   |  364 ++--
 .../OverseerCollectionConfigSetProcessor.java      |   16 +-
 .../cloud/OverseerConfigSetMessageHandler.java     |   17 +-
 .../apache/solr/cloud/OverseerElectionContext.java |   69 +-
 .../apache/solr/cloud/OverseerMessageHandler.java  |    3 +-
 .../apache/solr/cloud/OverseerNodePrioritizer.java |  120 --
 .../solr/cloud/OverseerTaskExecutorTask.java       |   36 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |  218 +-
 .../org/apache/solr/cloud/OverseerTaskQueue.java   |  168 +-
 .../solr/cloud/RecoveringCoreTermWatcher.java      |   27 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java    |  632 +++---
 .../solr/cloud/ShardLeaderElectionContext.java     |   97 +-
 .../solr/cloud/ShardLeaderElectionContextBase.java |   63 +-
 .../java/org/apache/solr/cloud/SolrZkServer.java   |    6 +-
 .../java/org/apache/solr/cloud/StatePublisher.java |   60 +-
 .../java/org/apache/solr/cloud/SyncStrategy.java   |   13 +-
 .../org/apache/solr/cloud/ZkCollectionTerms.java   |   43 +-
 .../java/org/apache/solr/cloud/ZkController.java   | 1291 ++++++------
 .../org/apache/solr/cloud/ZkDistributedQueue.java  |  542 +----
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |   84 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java    |   20 +-
 .../solr/cloud/api/collections/AddReplicaCmd.java  |   15 +-
 .../solr/cloud/api/collections/AliasCmd.java       |   13 +-
 .../apache/solr/cloud/api/collections/Assign.java  |   43 +-
 .../solr/cloud/api/collections/BackupCmd.java      |    2 -
 .../cloud/api/collections/CreateCollectionCmd.java |  232 ++-
 .../solr/cloud/api/collections/CreateShardCmd.java |   15 +-
 .../solr/cloud/api/collections/DeleteAliasCmd.java |    2 +-
 .../cloud/api/collections/DeleteCollectionCmd.java |   12 +-
 .../solr/cloud/api/collections/DeleteNodeCmd.java  |   90 +-
 .../cloud/api/collections/DeleteReplicaCmd.java    |   98 +-
 .../solr/cloud/api/collections/DeleteShardCmd.java |   31 +-
 .../solr/cloud/api/collections/MigrateCmd.java     |    6 +-
 .../solr/cloud/api/collections/MoveReplicaCmd.java |   26 +-
 .../OverseerCollectionMessageHandler.java          |  150 +-
 .../cloud/api/collections/OverseerRoleCmd.java     |    5 +-
 .../cloud/api/collections/OverseerStatusCmd.java   |    1 -
 .../solr/cloud/api/collections/RenameCmd.java      |    2 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |  136 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |    4 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |  221 +--
 .../solr/cloud/overseer/ClusterStateMutator.java   |   20 +-
 .../solr/cloud/overseer/CollectionMutator.java     |   31 +-
 .../apache/solr/cloud/overseer/NodeMutator.java    |    2 -
 .../apache/solr/cloud/overseer/ReplicaMutator.java |   30 +-
 .../apache/solr/cloud/overseer/SliceMutator.java   |    7 +-
 .../apache/solr/cloud/overseer/ZkStateWriter.java  |  288 +--
 .../java/org/apache/solr/core/BlobRepository.java  |   39 +-
 .../apache/solr/core/CachingDirectoryFactory.java  |   30 +-
 .../org/apache/solr/core/ConfigSetService.java     |   10 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  653 +++---
 .../src/java/org/apache/solr/core/CoreSorter.java  |    4 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |    5 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |    2 -
 .../java/org/apache/solr/core/RequestParams.java   |    2 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |   97 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |  728 ++++---
 .../src/java/org/apache/solr/core/SolrCores.java   |   47 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |  173 +-
 .../java/org/apache/solr/core/SolrTinyBuilder.java |    6 -
 .../java/org/apache/solr/core/SolrXmlConfig.java   |  234 +--
 .../apache/solr/core/StandardDirectoryFactory.java |   13 +-
 .../java/org/apache/solr/core/XmlConfigFile.java   |  129 +-
 .../src/java/org/apache/solr/core/ZkContainer.java |    7 +-
 .../org/apache/solr/core/backup/BackupManager.java |    2 +-
 .../apache/solr/filestore/DistribPackageStore.java |    2 +-
 .../org/apache/solr/filestore/PackageStoreAPI.java |    8 +-
 .../java/org/apache/solr/handler/BlobHandler.java  |   78 +-
 .../solr/handler/ContentStreamHandlerBase.java     |    7 +
 .../java/org/apache/solr/handler/IndexFetcher.java |   36 +-
 .../apache/solr/handler/ReplicationHandler.java    |   26 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   29 +-
 .../org/apache/solr/handler/SchemaHandler.java     |    4 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |    2 +-
 .../solr/handler/admin/AdminHandlersProxy.java     |    2 +-
 .../org/apache/solr/handler/admin/ColStatus.java   |    5 +-
 .../solr/handler/admin/CollectionHandlerApi.java   |    2 +-
 .../solr/handler/admin/CollectionsHandler.java     |  189 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |   38 +-
 .../solr/handler/admin/CoreAdminOperation.java     |   10 +-
 .../solr/handler/admin/DeleteSnapshotOp.java       |   11 +-
 .../solr/handler/admin/HealthCheckHandler.java     |    4 +-
 .../apache/solr/handler/admin/MergeIndexesOp.java  |   98 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |    6 +-
 .../apache/solr/handler/admin/PrepRecoveryOp.java  |   32 +-
 .../solr/handler/admin/RebalanceLeaders.java       |    4 +-
 .../solr/handler/admin/RequestSyncShardOp.java     |    1 -
 .../solr/handler/admin/ShowFileRequestHandler.java |    2 +-
 .../solr/handler/admin/SystemInfoHandler.java      |    1 -
 .../solr/handler/admin/ZookeeperInfoHandler.java   |    7 +-
 .../solr/handler/component/CloudReplicaSource.java |  101 +-
 .../solr/handler/component/HttpShardHandler.java   |   51 +-
 .../handler/component/HttpShardHandlerFactory.java |   17 +-
 .../handler/component/IterativeMergeStrategy.java  |    2 -
 .../handler/component/QueryElevationComponent.java |   15 +-
 .../handler/component/RealTimeGetComponent.java    |    1 -
 .../solr/handler/component/ReplicaSource.java      |    2 +-
 .../solr/handler/component/SearchHandler.java      |    3 +-
 .../handler/component/ShardHandlerFactory.java     |    1 -
 .../solr/handler/component/ShardRequest.java       |    3 +-
 .../handler/component/SpellCheckComponent.java     |    4 +-
 .../handler/component/StandaloneReplicaSource.java |    5 +-
 .../solr/handler/component/SuggestComponent.java   |    1 -
 .../solr/handler/component/TermsComponent.java     |    8 +-
 .../apache/solr/handler/loader/JavabinLoader.java  |   13 +-
 .../org/apache/solr/handler/loader/XMLLoader.java  |   12 +-
 .../org/apache/solr/handler/sql/SolrSchema.java    |    1 -
 .../org/apache/solr/legacy/BBoxValueSource.java    |    1 -
 .../java/org/apache/solr/metrics/MetricsMap.java   |    1 -
 .../apache/solr/metrics/SolrMetricRegistry.java    |    1 -
 .../solr/metrics/reporters/solr/SolrReporter.java  |    1 -
 .../solr/metrics/rrd/SolrRrdBackendFactory.java    |    1 -
 .../apache/solr/parser/SolrQueryParserBase.java    |    1 -
 .../java/org/apache/solr/pkg/PackageLoader.java    |    2 +-
 .../apache/solr/request/LocalSolrQueryRequest.java |    6 +
 .../apache/solr/request/SolrQueryRequestBase.java  |    1 -
 .../apache/solr/request/SolrRequestHandler.java    |    1 -
 .../apache/solr/response/BinaryResponseWriter.java |    1 -
 .../apache/solr/response/RawResponseWriter.java    |    9 +-
 .../apache/solr/rest/ManagedResourceStorage.java   |    8 +-
 .../solr/rest/schema/FieldTypeXmlAdapter.java      |   55 +-
 .../org/apache/solr/schema/AbstractEnumField.java  |    5 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |   69 +-
 .../solr/schema/FileExchangeRateProvider.java      |    5 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |  142 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |  156 +-
 .../solr/schema/ManagedIndexSchemaFactory.java     |   44 +-
 .../java/org/apache/solr/schema/SchemaManager.java |    3 +-
 .../org/apache/solr/schema/TrieDoubleField.java    |    2 -
 .../org/apache/solr/schema/TrieFloatField.java     |    2 -
 .../java/org/apache/solr/schema/TrieIntField.java  |    2 -
 .../java/org/apache/solr/schema/TrieLongField.java |    2 -
 .../apache/solr/schema/ZkIndexSchemaReader.java    |  163 +-
 .../java/org/apache/solr/search/CacheConfig.java   |   28 +-
 .../java/org/apache/solr/search/CaffeineCache.java |    3 -
 .../src/java/org/apache/solr/search/Filter.java    |    1 -
 .../org/apache/solr/search/SolrCoreParser.java     |   58 +-
 .../org/apache/solr/search/SolrFieldCacheBean.java |    3 -
 .../org/apache/solr/search/facet/FacetMerger.java  |    2 +-
 .../solr/search/function/FileFloatSource.java      |    1 -
 .../solr/search/function/OrdFieldSource.java       |    1 -
 .../grouping/distributed/command/QueryCommand.java |    1 -
 .../org/apache/solr/search/join/XCJFQParser.java   |    3 +-
 .../apache/solr/search/join/XCJFQParserPlugin.java |    7 +-
 .../org/apache/solr/search/stats/StatsCache.java   |    1 -
 .../solr/security/JWTVerificationkeyResolver.java  |    1 -
 .../solr/security/PKIAuthenticationPlugin.java     |   11 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |  228 +--
 .../org/apache/solr/servlet/ResponseUtils.java     |    2 -
 .../apache/solr/servlet/SolrDispatchFilter.java    |  116 +-
 .../apache/solr/servlet/SolrLifcycleListener.java  |   34 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |   16 +-
 .../apache/solr/servlet/SolrShutdownHandler.java   |    6 +-
 .../solr/spelling/AbstractLuceneSpellChecker.java  |    1 -
 .../apache/solr/spelling/SpellCheckCollator.java   |    1 -
 .../solr/spelling/suggest/SolrSuggester.java       |    1 -
 .../org/apache/solr/store/blockcache/Metrics.java  |    1 -
 .../java/org/apache/solr/update/CommitTracker.java |   15 +-
 .../apache/solr/update/DefaultSolrCoreState.java   |  142 +-
 .../org/apache/solr/update/IndexFingerprint.java   |    1 -
 .../src/java/org/apache/solr/update/PeerSync.java  |   30 +-
 .../org/apache/solr/update/PeerSyncWithLeader.java |   11 +-
 .../org/apache/solr/update/SolrCmdDistributor.java |   53 +-
 .../java/org/apache/solr/update/SolrCoreState.java |   12 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |   85 +-
 .../java/org/apache/solr/update/UpdateHandler.java |    1 -
 .../src/java/org/apache/solr/update/UpdateLog.java |    8 +-
 .../org/apache/solr/update/UpdateShardHandler.java |    4 +-
 .../java/org/apache/solr/update/VersionInfo.java   |   37 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java     |   78 +-
 .../processor/DistributedUpdateProcessor.java      |  230 ++-
 .../processor/DistributedZkUpdateProcessor.java    |  117 +-
 .../DocExpirationUpdateProcessorFactory.java       |    2 -
 .../processor/RoutedAliasUpdateProcessor.java      |    1 -
 .../update/processor/TolerantUpdateProcessor.java  |    6 +-
 .../update/processor/UpdateRequestProcessor.java   |    1 -
 .../processor/UpdateRequestProcessorChain.java     |    5 +
 .../src/java/org/apache/solr/util/ExportTool.java  |   39 +-
 .../java/org/apache/solr/util/SafeXMLParsing.java  |    1 -
 .../java/org/apache/solr/util/SimplePostTool.java  |   31 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |  107 +-
 .../org/apache/solr/util/StartupLoggingUtils.java  |    2 +-
 .../org/apache/solr/util/SystemIdResolver.java     |    1 -
 .../solr/util/plugin/AbstractPluginLoader.java     |    7 +-
 .../apache/solr/util/plugin/MapPluginLoader.java   |    1 -
 .../solr/util/plugin/NamedListPluginLoader.java    |    1 -
 solr/core/src/resources/ShortClassNames.properties |    1 +
 solr/core/src/test-files/log4j2.xml                |    6 +-
 .../solr/collection1/conf/solrconfig-elevate.xml   |   28 +-
 .../solr/configsets/xcjf/conf/solrconfig.xml       |    6 +
 .../org/apache/solr/BasicFunctionalityTest.java    |    1 -
 .../src/test/org/apache/solr/CursorPagingTest.java |   22 +-
 .../src/test/org/apache/solr/EchoParamsTest.java   |   11 +-
 .../apache/solr/HelloWorldSolrCloudTestCase.java   |    2 -
 .../test/org/apache/solr/MinimalSchemaTest.java    |   11 +-
 .../test/org/apache/solr/SolrTestCaseJ4Test.java   |   12 +-
 .../test/org/apache/solr/TestCrossCoreJoin.java    |   17 +-
 .../apache/solr/TestHighlightDedupGrouping.java    |    1 -
 solr/core/src/test/org/apache/solr/TestJoin.java   |   28 +-
 .../test/org/apache/solr/TestRandomDVFaceting.java |   13 +-
 .../solr/TestSimpleTrackingShardHandler.java       |    1 -
 .../org/apache/solr/TestSolrCoreProperties.java    |    1 -
 .../test/org/apache/solr/TestTolerantSearch.java   |   27 +-
 .../analysis/ProtectedTermFilterFactoryTest.java   |   13 +-
 .../analysis/TestWordDelimiterFilterFactory.java   |   87 +-
 .../solr/backcompat/TestLuceneIndexBackCompat.java |    7 +-
 .../TestEmbeddedSolrServerAdminHandler.java        |    2 +
 .../TestEmbeddedSolrServerConstructors.java        |    2 +
 .../embedded/TestEmbeddedSolrServerSchemaAPI.java  |    2 +
 .../client/solrj/embedded/TestJettySolrRunner.java |    5 +-
 .../test/org/apache/solr/cloud/AddReplicaTest.java |   42 +-
 .../apache/solr/cloud/AliasIntegrationTest.java    |    4 -
 .../apache/solr/cloud/BasicDistributedZkTest.java  |    2 +-
 .../solr/cloud/ChaosMonkeyNothingIsSafeTest.java   |    2 +-
 ...aosMonkeyNothingIsSafeWithPullReplicasTest.java |    2 +-
 .../solr/cloud/ChaosMonkeySafeLeaderTest.java      |    4 +-
 .../ChaosMonkeySafeLeaderWithPullReplicasTest.java |    1 -
 .../solr/cloud/ChaosMonkeyShardSplitTest.java      |   28 +-
 .../org/apache/solr/cloud/CleanupOldIndexTest.java |    4 -
 .../cloud/CloudExitableDirectoryReaderTest.java    |   19 +-
 .../apache/solr/cloud/ClusterStateMockUtil.java    |    4 +-
 .../solr/cloud/ClusterStateMockUtilTest.java       |    2 +-
 .../org/apache/solr/cloud/ClusterStateTest.java    |   21 +-
 .../apache/solr/cloud/ClusterStateUpdateTest.java  |   11 +-
 .../solr/cloud/CollectionStateZnodeTest.java       |    1 -
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |   26 +-
 .../apache/solr/cloud/ConnectionManagerTest.java   |  118 --
 .../solr/cloud/CreateCollectionCleanupTest.java    |    7 +-
 .../apache/solr/cloud/CreateRoutedAliasTest.java   |   16 +-
 .../solr/cloud/DeleteInactiveReplicaTest.java      |   39 +-
 .../cloud/DeleteLastCustomShardedReplicaTest.java  |    6 +-
 .../test/org/apache/solr/cloud/DeleteNodeTest.java |    3 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |   13 +-
 .../org/apache/solr/cloud/DeleteShardTest.java     |    3 -
 .../org/apache/solr/cloud/DeleteStatusTest.java    |    2 +-
 .../apache/solr/cloud/DistribCursorPagingTest.java |    1 -
 .../DistribDocExpirationUpdateProcessorTest.java   |    1 -
 .../solr/cloud/DistribJoinFromCollectionTest.java  |    2 -
 .../apache/solr/cloud/DistributedQueueTest.java    |  334 ----
 .../solr/cloud/DistributedVersionInfoTest.java     |    2 -
 .../apache/solr/cloud/DocValuesNotIndexedTest.java |   50 +-
 .../org/apache/solr/cloud/ForceLeaderTest.java     |    4 +-
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   |   13 +-
 .../cloud/FullThrottleStoppableIndexingThread.java |    2 -
 .../solr/cloud/HttpPartitionOnCommitTest.java      |    2 -
 .../org/apache/solr/cloud/HttpPartitionTest.java   |    2 -
 .../solr/cloud/LeaderElectionIntegrationTest.java  |    4 +-
 .../org/apache/solr/cloud/LeaderElectionTest.java  |   19 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java    |    2 -
 .../cloud/LeaderFailureAfterFreshStartTest.java    |   26 +-
 .../apache/solr/cloud/LeaderTragicEventTest.java   |    1 -
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java      |   42 +-
 .../solr/cloud/MetricsHistoryIntegrationTest.java  |    5 +-
 .../MetricsHistoryWithAuthIntegrationTest.java     |    2 +-
 .../org/apache/solr/cloud/MigrateRouteKeyTest.java |    1 -
 .../solr/cloud/MissingSegmentRecoveryTest.java     |    1 -
 .../solr/cloud/MoveReplicaHDFSFailoverTest.java    |    8 +-
 .../org/apache/solr/cloud/MoveReplicaHDFSTest.java |    4 -
 .../org/apache/solr/cloud/MoveReplicaTest.java     |   23 +-
 .../solr/cloud/MultiSolrCloudTestCaseTest.java     |   32 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java    |    1 -
 .../solr/cloud/NestedShardedAtomicUpdateTest.java  |   22 +-
 .../org/apache/solr/cloud/NodeMutatorTest.java     |   11 +-
 .../OutOfBoxZkACLAndCredentialsProvidersTest.java  |    9 +-
 .../solr/cloud/OverseerModifyCollectionTest.java   |    1 +
 .../org/apache/solr/cloud/OverseerRolesTest.java   |    1 -
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |   95 -
 .../test/org/apache/solr/cloud/OverseerTest.java   |   98 +-
 .../apache/solr/cloud/PeerSyncReplicationTest.java |    1 -
 .../solr/cloud/RecoveryAfterSoftCommitTest.java    |    1 -
 .../test/org/apache/solr/cloud/RecoveryZkTest.java |   14 +-
 .../org/apache/solr/cloud/ReplaceNodeTest.java     |  100 +-
 .../apache/solr/cloud/ReplicationFactorTest.java   |    2 -
 .../solr/cloud/RestartWhileUpdatingTest.java       |    1 -
 .../org/apache/solr/cloud/RollingRestartTest.java  |    4 +-
 .../org/apache/solr/cloud/SSLMigrationTest.java    |    1 -
 .../apache/solr/cloud/SaslZkACLProviderTest.java   |    2 -
 .../solr/cloud/SegmentTerminateEarlyTestState.java |    1 -
 .../apache/solr/cloud/ShardRoutingCustomTest.java  |    9 +-
 .../org/apache/solr/cloud/ShardRoutingTest.java    |  125 +-
 .../cloud/SharedFSAutoReplicaFailoverTest.java     |    6 +-
 .../apache/solr/cloud/SolrCloudBridgeTestCase.java |   91 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java    |   35 +-
 .../org/apache/solr/cloud/SolrXmlInZkTest.java     |    7 -
 .../test/org/apache/solr/cloud/SplitShardTest.java |   11 +-
 .../solr/cloud/TestAuthenticationFramework.java    |    2 +-
 .../apache/solr/cloud/TestCloudConsistency.java    |   23 +-
 .../apache/solr/cloud/TestCloudDeleteByQuery.java  |   35 +-
 .../TestCloudPhrasesIdentificationComponent.java   |    4 +-
 .../org/apache/solr/cloud/TestCloudPivotFacet.java |    9 +-
 .../solr/cloud/TestCloudPseudoReturnFields.java    |    2 -
 .../org/apache/solr/cloud/TestCloudRecovery.java   |    4 +-
 .../org/apache/solr/cloud/TestCloudRecovery2.java  |   27 +-
 .../solr/cloud/TestCloudSearcherWarming.java       |    1 -
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |   91 +-
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |    1 -
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |   15 +-
 .../cloud/TestDeleteCollectionOnDownNodes.java     |   22 +-
 .../solr/cloud/TestDownShardTolerantSearch.java    |    7 +-
 .../cloud/TestDynamicFieldNamesIndexCorrectly.java |   25 +-
 .../cloud/TestExclusionRuleCollectionAccess.java   |    1 -
 .../cloud/TestLeaderElectionWithEmptyReplica.java  |   11 +-
 .../solr/cloud/TestLocalStatsCacheCloud.java       |    1 +
 .../test/org/apache/solr/cloud/TestLockTree.java   |   23 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java    |   19 +-
 .../solr/cloud/TestOnReconnectListenerSupport.java |   19 +-
 .../org/apache/solr/cloud/TestPrepRecovery.java    |   12 +-
 .../org/apache/solr/cloud/TestPullReplica.java     |    6 +-
 .../solr/cloud/TestPullReplicaErrorHandling.java   |    1 -
 .../apache/solr/cloud/TestRandomFlRTGCloud.java    |    2 -
 .../solr/cloud/TestRandomRequestDistribution.java  |   22 +-
 .../apache/solr/cloud/TestRebalanceLeaders.java    |    8 +-
 .../apache/solr/cloud/TestRequestForwarding.java   |    6 +
 .../org/apache/solr/cloud/TestSegmentSorting.java  |    5 +-
 .../solr/cloud/TestSizeLimitedDistributedMap.java  |    6 +
 .../solr/cloud/TestSkipOverseerOperations.java     |    4 +-
 .../cloud/TestSolrCloudWithDelegationTokens.java   |    1 +
 .../solr/cloud/TestSolrCloudWithKerberosAlt.java   |   14 +-
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |   62 +-
 .../solr/cloud/TestStressInPlaceUpdates.java       |    2 -
 .../org/apache/solr/cloud/TestStressLiveNodes.java |    3 +-
 .../solr/cloud/TestTlogReplayVsRecovery.java       |    1 -
 .../org/apache/solr/cloud/TestTlogReplica.java     |   43 +-
 .../cloud/TestTolerantUpdateProcessorCloud.java    |   84 +-
 .../TestTolerantUpdateProcessorRandomCloud.java    |   17 +-
 .../cloud/TestWaitForStateWithJettyShutdowns.java  |   20 +-
 .../apache/solr/cloud/UnloadDistributedZkTest.java |   51 +-
 .../VMParamsZkACLAndCredentialsProvidersTest.java  |    2 +-
 .../org/apache/solr/cloud/ZkControllerTest.java    |    4 +-
 .../test/org/apache/solr/cloud/ZkFailoverTest.java |    2 +-
 .../org/apache/solr/cloud/ZkShardTermsTest.java    |   12 +-
 .../org/apache/solr/cloud/ZkSolrClientTest.java    |    6 +-
 .../CollectionsAPIAsyncDistributedZkTest.java      |   28 +-
 .../CollectionsAPIDistClusterPerZkTest.java        |    8 +-
 .../CollectionsAPIDistributedZkTest.java           |    7 +-
 .../CreateCollectionsIndexAndRestartTest.java      |   24 +-
 .../api/collections/CustomCollectionTest.java      |    2 -
 .../HdfsCollectionsAPIDistributedZkTest.java       |    6 -
 .../api/collections/ReplicaPropertiesBase.java     |    1 -
 .../solr/cloud/api/collections/ShardSplitTest.java |   48 +-
 .../SimpleCollectionCreateDeleteTest.java          |   25 +-
 .../cloud/api/collections/SplitByPrefixTest.java   |    1 -
 .../cloud/api/collections/TestCollectionAPI.java   |   20 +-
 .../TestCollectionsAPIViaSolrCloudCluster.java     |   25 +-
 .../collections/TestHdfsCloudBackupRestore.java    |   23 +-
 .../collections/TestLocalFSCloudBackupRestore.java |    1 -
 .../api/collections/TestReplicaProperties.java     |    1 -
 .../TestRequestStatusCollectionAPI.java            |   13 +-
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java    |    7 +-
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java     |    7 +-
 .../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java     |    7 +-
 .../solr/cloud/hdfs/HdfsRecoverLeaseTest.java      |    2 -
 .../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java |    4 -
 .../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java  |    2 -
 .../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java |    5 +-
 .../HdfsTlogReplayBufferedWhileIndexingTest.java   |    5 -
 .../cloud/hdfs/HdfsUnloadDistributedZkTest.java    |    2 -
 .../hdfs/HdfsWriteToMultipleCollectionsTest.java   |   15 +-
 .../org/apache/solr/cloud/hdfs/StressHdfsTest.java |    6 -
 .../cloud/overseer/TestClusterStateMutator.java    |    4 +-
 .../overseer/ZkCollectionPropsCachingTest.java     |    1 -
 .../apache/solr/core/BlobRepositoryCloudTest.java  |   13 +-
 .../solr/core/ByteBuffersDirectoryFactoryTest.java |   20 +-
 .../solr/core/ConfigureRecoveryStrategyTest.java   |    8 +-
 .../test/org/apache/solr/core/CoreSorterTest.java  |   21 +-
 .../org/apache/solr/core/DirectoryFactoryTest.java |    2 +-
 .../solr/core/ExitableDirectoryReaderTest.java     |    8 +
 .../apache/solr/core/MockShardHandlerFactory.java  |    1 -
 .../test/org/apache/solr/core/PluginInfoTest.java  |  283 ++-
 .../org/apache/solr/core/RequestHandlersTest.java  |    4 +-
 .../solr/core/SolrCoreCheckLockOnStartupTest.java  |    1 +
 .../test/org/apache/solr/core/SolrCoreTest.java    |    2 +
 .../solr/core/TestBackupRepositoryFactory.java     |    6 +-
 .../test/org/apache/solr/core/TestBadConfig.java   |   10 +-
 .../org/apache/solr/core/TestCodecSupport.java     |   30 +-
 .../src/test/org/apache/solr/core/TestConfig.java  |   81 +-
 .../apache/solr/core/TestConfigSetImmutable.java   |    1 +
 .../apache/solr/core/TestConfigSetProperties.java  |   14 +-
 .../test/org/apache/solr/core/TestConfigSets.java  |   27 +-
 .../org/apache/solr/core/TestCoreContainer.java    |   98 +-
 .../org/apache/solr/core/TestCoreDiscovery.java    |    5 +-
 .../apache/solr/core/TestCorePropertiesReload.java |   11 +-
 .../org/apache/solr/core/TestCustomStream.java     |    1 +
 .../solr/core/TestImplicitCoreProperties.java      |    2 +
 .../org/apache/solr/core/TestJmxIntegration.java   |    7 +-
 .../test/org/apache/solr/core/TestLazyCores.java   |    4 +-
 .../apache/solr/core/TestMergePolicyConfig.java    |    1 -
 .../src/test/org/apache/solr/core/TestNRTOpen.java |   12 +-
 .../apache/solr/core/TestQuerySenderListener.java  |    1 -
 .../apache/solr/core/TestQuerySenderNoQuery.java   |    1 -
 .../apache/solr/core/TestReloadAndDeleteDocs.java  |   10 +-
 .../apache/solr/core/TestShardHandlerFactory.java  |    8 +-
 .../apache/solr/core/TestSolrConfigHandler.java    |    5 +-
 .../src/test/org/apache/solr/core/TestSolrXml.java |   83 +-
 .../org/apache/solr/core/TestXIncludeConfig.java   |    2 -
 .../core/snapshots/TestSolrCloudSnapshots.java     |   24 +-
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |    1 -
 .../solr/filestore/TestDistribPackageStore.java    |   26 +-
 .../org/apache/solr/handler/JsonLoaderTest.java    |    2 +-
 .../org/apache/solr/handler/TestBlobHandler.java   |    1 -
 .../org/apache/solr/handler/TestConfigReload.java  |   24 +-
 .../solr/handler/TestHdfsBackupRestoreCore.java    |    1 -
 .../solr/handler/TestReplicationHandlerBackup.java |    2 -
 .../org/apache/solr/handler/TestReqParamsAPI.java  |    6 +-
 .../org/apache/solr/handler/TestRestoreCore.java   |    2 -
 .../org/apache/solr/handler/TestSQLHandler.java    |    1 -
 .../solr/handler/TestSQLHandlerNonCloud.java       |   21 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |    3 +-
 .../handler/TestSolrConfigHandlerConcurrent.java   |   25 +-
 .../solr/handler/TestSystemCollAutoCreate.java     |    1 -
 .../apache/solr/handler/V2ApiIntegrationTest.java  |    2 -
 .../org/apache/solr/handler/V2StandaloneTest.java  |    2 -
 .../solr/handler/XmlUpdateRequestHandlerTest.java  |   20 +-
 .../solr/handler/admin/AdminHandlersProxyTest.java |    3 +-
 .../handler/admin/CoreAdminCreateDiscoverTest.java |   14 +-
 .../solr/handler/admin/CoreAdminHandlerTest.java   |    9 +-
 .../admin/CoreMergeIndexesAdminHandlerTest.java    |   11 -
 .../solr/handler/admin/DaemonStreamApiTest.java    |   70 +-
 .../solr/handler/admin/HealthCheckHandlerTest.java |    2 -
 .../solr/handler/admin/IndexSizeEstimatorTest.java |    1 -
 .../apache/solr/handler/admin/InfoHandlerTest.java |    1 -
 .../solr/handler/admin/LukeRequestHandlerTest.java |   12 +-
 .../solr/handler/admin/MBeansHandlerTest.java      |    4 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |    2 -
 .../handler/admin/MetricsHistoryHandlerTest.java   |    4 +-
 .../admin/SegmentsInfoRequestHandlerTest.java      |    2 +-
 .../handler/admin/ShowFileRequestHandlerTest.java  |   24 +-
 .../solr/handler/admin/StatsReloadRaceTest.java    |    1 +
 .../solr/handler/admin/ZookeeperReadAPITest.java   |    4 -
 .../handler/admin/ZookeeperStatusHandlerTest.java  |    9 -
 .../handler/component/CloudReplicaSourceTest.java  |    1 -
 .../component/CustomHighlightComponentTest.java    |    2 +-
 .../component/DistributedDebugComponentTest.java   |   37 +-
 .../component/DistributedMLTComponentTest.java     |    1 -
 .../DistributedQueryComponentOptimizationTest.java |   17 +-
 .../DistributedQueryElevationComponentTest.java    |    1 -
 .../DistributedSpellCheckComponentTest.java        |    1 -
 .../handler/component/InfixSuggestersTest.java     |    1 +
 .../component/QueryElevationComponentTest.java     |    8 -
 .../solr/handler/component/SearchHandlerTest.java  |    1 -
 .../handler/component/ShardsWhitelistTest.java     |   47 +-
 .../solr/handler/component/StatsComponentTest.java |    2 +
 .../SuggestComponentContextFilterQueryTest.java    |   17 +-
 .../TermVectorComponentDistributedTest.java        |    1 -
 .../handler/component/TermVectorComponentTest.java |    7 -
 .../component/TestHttpShardHandlerFactory.java     |   40 +-
 .../component/TestTrackingShardHandlerFactory.java |   12 +-
 .../solr/handler/export/TestExportWriter.java      |    1 -
 .../solr/handler/tagger/RandomizedTaggerTest.java  |    1 -
 .../apache/solr/handler/tagger/TaggerTestCase.java |    6 +
 .../solr/handler/tagger/TaggingAttributeTest.java  |   12 +-
 .../solr/handler/tagger/XmlInterpolationTest.java  |   23 +-
 .../solr/highlight/FastVectorHighlighterTest.java  |   13 +-
 .../solr/highlight/HighlighterMaxOffsetTest.java   |    4 +-
 .../org/apache/solr/highlight/HighlighterTest.java |    2 +-
 .../highlight/TestPostingsSolrHighlighter.java     |   18 +-
 .../solr/index/WrapperMergePolicyFactoryTest.java  |   16 +-
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |    8 +-
 .../apache/solr/internal/csv/CSVPrinterTest.java   |    9 +-
 .../org/apache/solr/metrics/JvmMetricsTest.java    |   19 +-
 .../org/apache/solr/metrics/MetricsConfigTest.java |   17 +-
 .../solr/metrics/SolrCoreMetricManagerTest.java    |   13 +-
 .../apache/solr/metrics/SolrMetricManagerTest.java |  107 +-
 .../solr/metrics/SolrMetricsIntegrationTest.java   |   10 +-
 .../reporters/SolrGraphiteReporterTest.java        |    3 +-
 .../reporters/SolrJmxReporterCloudTest.java        |    1 -
 .../metrics/reporters/SolrJmxReporterTest.java     |    2 +
 .../metrics/reporters/SolrSlf4jReporterTest.java   |    2 +-
 .../reporters/solr/SolrCloudReportersTest.java     |    1 -
 .../reporters/solr/SolrShardReporterTest.java      |    3 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java     |    1 -
 .../org/apache/solr/request/SimpleFacetsTest.java  |    1 -
 .../apache/solr/request/TestRemoteStreaming.java   |   45 +-
 .../org/apache/solr/request/TestStreamBody.java    |    6 +-
 .../solr/request/TestUnInvertedFieldException.java |    7 +-
 .../solr/response/TestBinaryResponseWriter.java    |   11 +-
 .../solr/response/TestCSVResponseWriter.java       |    2 +
 .../solr/response/TestGeoJSONResponseWriter.java   |   13 +-
 .../solr/response/TestGraphMLResponseWriter.java   |    4 +-
 .../solr/response/TestRetrieveFieldsOptimizer.java |   99 +-
 .../transform/TestChildDocTransformer.java         |    1 -
 .../TestChildDocTransformerHierarchy.java          |    2 +
 .../transform/TestExplainDocTransformer.java       |    9 +-
 .../transform/TestSubQueryTransformerDistrib.java  |    3 -
 .../org/apache/solr/rest/SolrRestletTestBase.java  |   16 +-
 .../org/apache/solr/rest/TestManagedResource.java  |  108 +-
 .../solr/rest/TestManagedResourceStorage.java      |    7 +-
 .../test/org/apache/solr/rest/TestRestManager.java |    3 +-
 .../apache/solr/rest/schema/TestFieldResource.java |   13 +
 .../schema/TestFieldTypeCollectionResource.java    |   12 +
 .../solr/rest/schema/TestSchemaNameResource.java   |    1 +
 .../schema/TestSerializedLuceneMatchVersion.java   |    8 +-
 .../rest/schema/TestUniqueKeyFieldResource.java    |   13 +
 .../analysis/TestManagedStopFilterFactory.java     |   29 +-
 .../analysis/TestManagedSynonymFilterFactory.java  |   39 +-
 .../TestManagedSynonymGraphFilterFactory.java      |   29 +-
 .../org/apache/solr/schema/BadIndexSchemaTest.java |    1 +
 .../org/apache/solr/schema/BooleanFieldTest.java   |   11 +-
 .../apache/solr/schema/CustomAnalyzerStrField.java |    1 -
 .../test/org/apache/solr/schema/DateFieldTest.java |   18 +-
 .../solr/schema/ExternalFileFieldSortTest.java     |    3 +
 .../solr/schema/IndexSchemaRuntimeFieldTest.java   |   11 +-
 .../schema/ManagedSchemaRoundRobinCloudTest.java   |   14 +-
 .../org/apache/solr/schema/NumericFieldsTest.java  |    9 +-
 .../schema/OpenExchangeRatesOrgProviderTest.java   |   11 +-
 .../PreAnalyzedFieldManagedSchemaCloudTest.java    |    5 +-
 .../apache/solr/schema/PreAnalyzedFieldTest.java   |   14 +-
 .../apache/solr/schema/PrimitiveFieldTypeTest.java |    5 +-
 .../apache/solr/schema/SchemaApiFailureTest.java   |    2 -
 .../schema/SchemaVersionSpecificBehaviorTest.java  |    1 -
 .../org/apache/solr/schema/SchemaWatcherTest.java  |   12 +-
 .../apache/solr/schema/SynonymTokenizerTest.java   |    2 +-
 .../org/apache/solr/schema/TestBinaryField.java    |    4 +-
 .../solr/schema/TestBulkSchemaConcurrent.java      |    1 -
 .../apache/solr/schema/TestCloudSchemaless.java    |   24 +-
 .../solr/schema/TestHalfAndHalfDocValues.java      |   13 +-
 .../apache/solr/schema/TestManagedSchemaAPI.java   |    1 -
 .../org/apache/solr/schema/TestPointFields.java    |    1 -
 .../org/apache/solr/schema/TestPointFields2.java   |    2 -
 .../solr/schema/TestUseDocValuesAsStored.java      |   35 +-
 .../solr/schema/TestUseDocValuesAsStored2.java     |   34 +-
 .../org/apache/solr/search/FuzzySearchTest.java    |    2 -
 .../org/apache/solr/search/MergeStrategyTest.java  |   16 +-
 .../org/apache/solr/search/SpatialFilterTest.java  |   18 +-
 .../apache/solr/search/TestHashQParserPlugin.java  |   20 +-
 .../org/apache/solr/search/TestIndexSearcher.java  |    4 +-
 .../org/apache/solr/search/TestInitQParser.java    |    1 -
 .../org/apache/solr/search/TestMissingGroups.java  |    8 +-
 .../solr/search/TestPayloadScoreQParserPlugin.java |   13 +-
 .../test/org/apache/solr/search/TestRTGBase.java   |    1 -
 .../solr/search/TestReRankQParserPlugin.java       |    1 -
 .../org/apache/solr/search/TestRealTimeGet.java    |    2 -
 .../test/org/apache/solr/search/TestRecovery.java  |    1 -
 .../org/apache/solr/search/TestRecoveryHdfs.java   |   32 +-
 .../test/org/apache/solr/search/TestReload.java    |    2 +
 .../org/apache/solr/search/TestSmileRequest.java   |    1 -
 .../org/apache/solr/search/TestSolr4Spatial2.java  |    3 +-
 .../org/apache/solr/search/TestSolrCachePerf.java  |    1 -
 .../src/test/org/apache/solr/search/TestSolrJ.java |    2 -
 .../apache/solr/search/TestSolrQueryParser.java    |    1 -
 .../org/apache/solr/search/TestStressVersions.java |    1 -
 .../solr/search/TestSurroundQueryParser.java       |   10 +-
 .../org/apache/solr/search/TestXmlQParser.java     |    1 -
 .../search/facet/SpatialHeatmapFacetsTest.java     |    1 -
 .../search/facet/TestCloudJSONFacetJoinDomain.java |   31 +-
 .../solr/search/facet/TestCloudJSONFacetSKG.java   |   46 +-
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |   46 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |    1 -
 .../facet/TestJsonFacetsWithNestedObjects.java     |   12 +-
 .../solr/search/function/SortByFunctionTest.java   |   13 +-
 .../function/distance/DistanceFunctionTest.java    |    2 +
 .../org/apache/solr/search/join/BJQParserTest.java |    7 +-
 .../solr/search/join/TestCloudNestedDocsSort.java  |   24 +-
 .../solr/search/join/TestScoreJoinQPScore.java     |    1 -
 .../org/apache/solr/search/join/XCJFQueryTest.java |   12 +-
 .../apache/solr/search/json/TestJsonRequest.java   |    1 -
 .../solr/search/mlt/CloudMLTQParserTest.java       |    2 -
 .../similarities/TestIBSimilarityFactory.java      |   14 +-
 .../TestPerFieldSimilarityWithDefaultOverride.java |   16 +-
 .../TestSweetSpotSimilarityFactory.java            |   12 +-
 .../apache/solr/search/stats/TestDistribIDF.java   |   11 +-
 .../solr/security/AuditLoggerIntegrationTest.java  |    1 -
 .../solr/security/BasicAuthIntegrationTest.java    |    5 +-
 .../solr/security/BasicAuthOnSingleNodeTest.java   |    1 -
 .../solr/security/BasicAuthStandaloneTest.java     |    3 +-
 .../security/JWTAuthPluginIntegrationTest.java     |    7 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |    1 +
 .../security/PKIAuthenticationIntegrationTest.java |    1 +
 .../hadoop/TestDelegationWithHadoopAuth.java       |    1 +
 .../hadoop/TestImpersonationWithHadoopAuth.java    |    1 +
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |    3 +-
 .../solr/servlet/HttpSolrCallGetCoreTest.java      |    1 -
 .../apache/solr/servlet/ResponseHeaderTest.java    |    4 -
 .../solr/spelling/IndexBasedSpellCheckerTest.java  |   21 +-
 .../SpellCheckCollatorWithCollapseTest.java        |   15 +-
 .../spelling/WordBreakSolrSpellCheckerTest.java    |   12 +-
 .../solr/spelling/suggest/SuggesterTest.java       |    1 -
 .../solr/store/blockcache/BlockCacheTest.java      |   21 +-
 .../solr/store/blockcache/BufferStoreTest.java     |    7 +-
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |    3 -
 .../org/apache/solr/update/AddBlockUpdateTest.java |    1 +
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |    1 -
 .../test/org/apache/solr/update/PeerSyncTest.java  |    2 -
 .../PeerSyncWithIndexFingerprintCachingTest.java   |    1 -
 .../org/apache/solr/update/SoftAutoCommitTest.java |    1 -
 .../apache/solr/update/SolrCmdDistributorTest.java |   49 +-
 .../apache/solr/update/SolrIndexConfigTest.java    |  254 +--
 .../apache/solr/update/SolrIndexMetricsTest.java   |    1 -
 .../org/apache/solr/update/TestHdfsUpdateLog.java  |   10 +-
 .../update/TestInPlaceUpdateWithRouteField.java    |    1 -
 .../solr/update/TestInPlaceUpdatesDistrib.java     |   35 +-
 .../test/org/apache/solr/update/UpdateLogTest.java |   15 +-
 .../org/apache/solr/update/VersionInfoTest.java    |    4 +
 .../AddSchemaFieldsUpdateProcessorFactoryTest.java |    1 -
 .../AtomicUpdateProcessorFactoryTest.java          |    1 -
 .../processor/AtomicUpdateRemovalJavabinTest.java  |    1 -
 ...assificationUpdateProcessorIntegrationTest.java |    1 -
 .../processor/DistributedUpdateProcessorTest.java  |    2 +-
 .../update/processor/NestedAtomicUpdateTest.java   |   12 +-
 .../ParsingFieldUpdateProcessorsTest.java          |   14 +-
 .../processor/TemplateUpdateProcessorTest.java     |    6 +-
 .../TimeRoutedAliasUpdateProcessorTest.java        |    1 -
 .../processor/TolerantUpdateProcessorTest.java     |   16 +-
 .../processor/UUIDUpdateProcessorFallbackTest.java |   12 +-
 .../test/org/apache/solr/util/AuthToolTest.java    |    1 +
 .../src/test/org/apache/solr/util/DOMUtilTest.java |   67 +-
 .../org/apache/solr/util/OrderedExecutorTest.java  |   25 +-
 .../org/apache/solr/util/SimplePostToolTest.java   |    4 +-
 .../test/org/apache/solr/util/TestExportTool.java  |    1 -
 .../org/apache/solr/util/TestSystemIdResolver.java |    9 +-
 .../example-DIH/solr/solr/conf/managed-schema      |    2 +-
 solr/server/etc/jetty-http.xml                     |    3 +-
 solr/server/etc/jetty.xml                          |    4 +-
 solr/server/resources/log4j2.xml                   |    2 +-
 .../solr/configsets/_default/conf/managed-schema   |   16 +-
 solr/solrj/build.gradle                            |    4 +
 .../solr/client/solrj/cloud/DistributedLock.java   |    2 +-
 .../solr/client/solrj/cloud/DistributedQueue.java  |   20 -
 .../apache/solr/client/solrj/cloud/ShardTerms.java |   26 +-
 .../solr/client/solrj/cloud/SocketProxy.java       |    1 -
 .../client/solrj/impl/BaseCloudSolrClient.java     |   13 +-
 .../solrj/impl/BaseHttpClusterStateProvider.java   |   40 +-
 .../client/solrj/impl/BinaryResponseParser.java    |    1 -
 .../client/solrj/impl/CloudHttp2SolrClient.java    |    1 -
 .../impl/ConcurrentUpdateHttp2SolrClient.java      |    1 -
 .../solrj/impl/ConcurrentUpdateSolrClient.java     |   10 +-
 .../solr/client/solrj/impl/Http2SolrClient.java    |  294 +--
 .../solr/client/solrj/impl/HttpSolrClient.java     |    6 +-
 .../solr/client/solrj/impl/LBHttp2SolrClient.java  |    1 +
 .../solr/client/solrj/impl/LBSolrClient.java       |   20 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |   23 +-
 .../solrj/impl/ZkClientClusterStateProvider.java   |    7 +-
 .../client/solrj/impl/ZkDistribStateManager.java   |    2 +-
 .../solr/client/solrj/io/SolrClientCache.java      |   12 +-
 .../solr/client/solrj/io/sql/ConnectionImpl.java   |    1 -
 .../client/solrj/io/sql/DatabaseMetaDataImpl.java  |    2 +-
 .../solr/client/solrj/io/sql/StatementImpl.java    |    1 -
 .../client/solrj/io/stream/CloudSolrStream.java    |    1 -
 .../client/solrj/io/stream/DeepRandomStream.java   |   32 +-
 .../solrj/io/stream/FeaturesSelectionStream.java   |    4 +-
 .../client/solrj/io/stream/TextLogitStream.java    |    5 +-
 .../solr/client/solrj/io/stream/TopicStream.java   |   32 +-
 .../solr/client/solrj/io/stream/TupleStream.java   |    4 +-
 .../client/solrj/io/stream/expr/StreamFactory.java |    2 +-
 .../solrj/request/CollectionAdminRequest.java      |    2 -
 .../solrj/request/ConfigSetAdminRequest.java       |    6 +-
 .../solrj/request/ContentStreamUpdateRequest.java  |    9 +-
 .../solrj/request/DocumentAnalysisRequest.java     |    7 +-
 .../solr/client/solrj/request/RequestWriter.java   |   41 +-
 .../solrj/request/StreamingUpdateRequest.java      |    1 -
 .../solr/client/solrj/request/UpdateRequest.java   |    1 -
 .../routing/NodePreferenceRulesComparator.java     |    1 -
 .../RequestReplicaListTransformerGenerator.java    |    1 -
 .../client/solrj/util/SolrBasicAuthentication.java |    4 +-
 .../src/java/org/apache/solr/common/ParWork.java   |   53 +-
 .../org/apache/solr/common/ParWorkExecutor.java    |   23 +-
 .../apache/solr/common/PerThreadExecService.java   |    7 +-
 .../java/org/apache/solr/common/SolrException.java |    2 +-
 .../java/org/apache/solr/common/SolrThread.java    |    1 -
 .../apache/solr/common/ToleratedUpdateError.java   |    3 +-
 .../org/apache/solr/common/cloud/ClusterState.java |   71 +-
 .../apache/solr/common/cloud/ClusterStateUtil.java |    6 +-
 .../common/cloud/CollectionStatePredicate.java     |    1 -
 .../solr/common/cloud/ConnectionManager.java       |   58 +-
 .../apache/solr/common/cloud/DocCollection.java    |   41 +-
 .../solr/common/cloud/LiveNodesListener.java       |    3 +-
 .../solr/common/cloud/LiveNodesPredicate.java      |    2 +-
 .../solr/common/cloud/NodesSysPropsCacher.java     |    4 +-
 .../org/apache/solr/common/cloud/OnReconnect.java  |    1 +
 .../java/org/apache/solr/common/cloud/Replica.java |    3 +-
 .../java/org/apache/solr/common/cloud/Slice.java   |    1 -
 .../org/apache/solr/common/cloud/SolrZkClient.java |  168 +-
 .../apache/solr/common/cloud/SolrZooKeeper.java    |   38 +-
 .../apache/solr/common/cloud/ZkCmdExecutor.java    |    6 +-
 .../apache/solr/common/cloud/ZkConfigManager.java  |    1 -
 .../solr/common/cloud/ZkMaintenanceUtils.java      |    1 -
 .../apache/solr/common/cloud/ZkStateReader.java    |  756 +++----
 .../org/apache/solr/common/util/CloseTracker.java  |    1 -
 .../solr/common/util/ConcurrentNamedList.java      |   11 -
 .../apache/solr/common/util/ContentStreamBase.java |    9 +-
 .../org/apache/solr/common/util/ExecutorUtil.java  |   13 +-
 .../org/apache/solr/common/util/JavaBinCodec.java  |   38 +-
 .../solr/common/util/ObjectReleaseTracker.java     |   35 +-
 .../solr/common/util/SolrQueuedThreadPool.java     | 1586 +++++++--------
 .../util/SolrScheduledExecutorScheduler.java       |    8 +-
 .../java/org/apache/solr/common/util/SysStats.java |    1 -
 .../java/org/apache/solr/common/util/Utils.java    |   45 +-
 .../apache/solr/common/util/ValidatingJsonMap.java |    2 +-
 .../org/apache/zookeeper/ZooKeeperExposed.java     |   19 +-
 .../UsingSolrJRefGuideExamplesTest.java            |    6 +-
 .../ref_guide_examples/ZkConfigFilesTest.java      |    9 +-
 .../client/solrj/MergeIndexesExampleTestBase.java  |    2 +-
 .../client/solrj/SolrExampleBinaryHttp2Test.java   |    3 +-
 .../solr/client/solrj/SolrExampleBinaryTest.java   |    1 -
 .../apache/solr/client/solrj/SolrExampleTests.java |  146 +-
 .../solr/client/solrj/SolrExampleTestsBase.java    |   99 +-
 .../solr/client/solrj/SolrExampleXMLTest.java      |    1 -
 .../solr/client/solrj/SolrExceptionTest.java       |    7 +-
 .../client/solrj/SolrSchemalessExampleTest.java    |   31 +-
 .../apache/solr/client/solrj/TestBatchUpdate.java  |   15 +-
 .../solr/client/solrj/TestLBHttp2SolrClient.java   |    2 -
 .../solr/client/solrj/TestLBHttpSolrClient.java    |   62 +-
 .../solr/client/solrj/TestSolrJErrorHandling.java  |   51 +-
 .../AbstractEmbeddedSolrServerTestCase.java        |   25 +-
 .../client/solrj/embedded/JettyWebappTest.java     |    6 +-
 .../solrj/embedded/SolrExampleEmbeddedTest.java    |    4 -
 .../solrj/embedded/SolrExampleJettyTest.java       |    2 -
 .../solrj/embedded/SolrExampleStreamingTest.java   |    7 -
 .../solrj/embedded/SolrExampleXMLHttp2Test.java    |    9 +-
 .../solrj/embedded/TestEmbeddedSolrServer.java     |   18 +-
 .../client/solrj/embedded/TestSolrProperties.java  |    8 +-
 .../solrj/impl/BaseSolrClientWireMockTest.java     |   13 +-
 .../client/solrj/impl/BasicHttpSolrClientTest.java |    9 +-
 .../solrj/impl/CloudHttp2SolrClientTest.java       |    5 +-
 .../solrj/impl/CloudSolrClientCacheTest.java       |    2 +-
 .../client/solrj/impl/CloudSolrClientTest.java     |   40 +-
 ...oncurrentUpdateHttp2SolrClientBadInputTest.java |    8 +
 .../ConcurrentUpdateSolrClientBadInputTest.java    |    7 +
 .../solrj/impl/ConcurrentUpdateSolrClientTest.java |   44 +-
 .../impl/Http2SolrClientCompatibilityTest.java     |    6 -
 .../solrj/impl/HttpSolrClientBadInputTest.java     |   15 +-
 .../solrj/impl/HttpSolrClientConPoolTest.java      |   34 +-
 .../impl/HttpSolrClientSSLAuthConPoolTest.java     |   28 +-
 .../solrj/impl/LBHttpSolrClientBadInputTest.java   |    7 +-
 .../client/solrj/impl/LBHttpSolrClientTest.java    |    3 -
 .../client/solrj/io/graph/GraphExpressionTest.java |    6 +-
 .../solr/client/solrj/io/graph/GraphTest.java      |    1 -
 .../apache/solr/client/solrj/io/sql/JdbcTest.java  |    2 -
 .../solrj/io/stream/CloudAuthStreamTest.java       |    1 -
 .../client/solrj/io/stream/JDBCStreamTest.java     |   95 +-
 .../solrj/io/stream/SelectWithEvaluatorsTest.java  |    7 -
 .../solrj/io/stream/StreamDecoratorTest.java       |    1 -
 .../solr/client/solrj/io/stream/StreamingTest.java |   10 +-
 .../solr/client/solrj/request/SchemaTest.java      |   24 +-
 .../solr/client/solrj/request/TestCoreAdmin.java   |   25 +-
 .../solr/client/solrj/request/TestV2Request.java   |    2 +-
 .../solrj/response/NoOpResponseParserTest.java     |   11 +-
 .../solrj/response/TestSpellCheckResponse.java     |    2 +-
 .../solrj/response/TestSuggesterResponse.java      |    2 +-
 .../routing/NodePreferenceRulesComparatorTest.java |    8 +-
 .../cloud/TestCloudCollectionsListeners.java       |    1 -
 .../common/cloud/TestDocCollectionWatcher.java     |    1 -
 .../solr/common/cloud/TestZkConfigManager.java     |    4 +-
 solr/solrj/src/test/org/noggit/TestJSONParser.java |   41 +-
 .../apache/solr/BaseDistributedSearchTestCase.java |   37 +-
 .../src/java/org/apache/solr/JSONTestUtil.java     |    3 -
 .../org/apache/solr/SolrIgnoredThreadsFilter.java  |   20 +-
 .../java/org/apache/solr/SolrJettyTestBase.java    |   59 +-
 .../src/java/org/apache/solr/SolrTestCase.java     |  274 ++-
 .../src/java/org/apache/solr/SolrTestCaseHS.java   |    7 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |   41 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |   28 +-
 .../org/apache/solr/cloud/AbstractZkTestCase.java  |   37 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java    |    8 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |   52 +-
 .../org/apache/solr/cloud/MockZkStateReader.java   |    8 +-
 .../apache/solr/cloud/MultiSolrCloudTestCase.java  |   46 +-
 .../apache/solr/cloud/SolrCloudAuthTestCase.java   |   61 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |   74 +-
 .../apache/solr/cloud/StoppableIndexingThread.java |    7 +-
 .../java/org/apache/solr/cloud/ZkTestServer.java   |  102 +-
 .../component/TrackingShardHandlerFactory.java     |    1 -
 .../java/org/apache/solr/util/BaseTestHarness.java |   77 +-
 .../java/org/apache/solr/util/DOMUtilTestBase.java |   25 +-
 .../java/org/apache/solr/util/RestTestBase.java    |  116 +-
 .../java/org/apache/solr/util/RestTestHarness.java |   15 +-
 .../src/java/org/apache/solr/util/TestHarness.java |   86 +-
 .../apache/zookeeper/server/ZooKeeperServer.java   | 2081 ++++++++++++++++++++
 .../src/resources/logconf/log4j2-fast.xml          |    2 +-
 .../src/resources/logconf/log4j2-startup-debug.xml |   12 +-
 .../src/resources/logconf/log4j2-std-debug.xml     |    8 +-
 .../org/apache/solr/cloud/JettySolrRunnerTest.java |    1 -
 .../solr/cloud/MiniSolrCloudClusterTest.java       |   15 +-
 versions.lock                                      |   11 +-
 versions.props                                     |    3 +-
 840 files changed, 13927 insertions(+), 12543 deletions(-)
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java
 create mode 100644 solr/test-framework/src/java/org/apache/zookeeper/server/ZooKeeperServer.java