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 2021/01/29 20:42:39 UTC
[lucene-solr] branch reference_impl updated (8631636 -> 867e486)
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 8631636 @1270 Wait to see published down state before create live node.
add b8945de @1271 Recovery loop fix.
add 3950d42 @1272 Start working in load fail safe correctly.
add 26e2cf7 @1273 Remove exploratory fix that was not the love.
add 72b8db1 @1274 Recovery loop fix 2.
add a72baab @1275 Fix wait for down and some lock and recovery issues.
add 0f23e09 @1276 Don't interrupt election and SolrQos tweaks and recovery tweaks.
add 960063a @1277 Don't keep going on bulk update request on a 404.
add 27bb506 @1278 Explicit truncation cast.
add 7a85375 @1279 Core replacing only if using shared storage.
add ad55ecb @1280 Election tweaks for shard leader.
add 65b1ef8 @1281 Clean up some MDC core logging.
add 5351ab3 @1282 Fix long to int for real.
add 84f1dff @1283 Don't cancel recovery.
add 57e1627 @1284 Allow ACTIVE as well again.
add 1f2b383 @1285 Cleanup
add 2830a37 @1286 Better error message.
add 94dbe77 @1287 Tweak prep recovery cmd.
add 34cc966 @1288 Only check state in prep recovery and don't try to unload cores that look to have moved.
add 6884bde @1289 Allow getting the leader before being live.
add b3ed5a8 @1290 Start to prepare for early access production.
add 26736dc @1291 Cleanup 1290. I also again ran into issues with reload and the way many Solr tests try to cheat SolrCore ref counting - this is halfway though on addressing that.
add d135f2c SOLR-14947: Print out image info after gradle docker task. (#2007)
add 284cafe SOLR-14957: Add Prometheus Exporter to docker PATH. Fix classpath issues. (#2017)
add 240dad4 SOLR-14955: Add env var options to Prometheus Export scripts. (#2038)
add df17d92 SOLR-14972: Change default port of prometheus exporter to 8989 (#2046)
add a649da3 SOLR-14949: Ability to customize Solr Docker build (#2020)
add 53af6fc SOLR-14949: Adding githubUrl option for docker build. (#2074)
add 17b983e SOLR-15001 Docker: require init_var_solr.sh (#2083)
add 9be59f9 SOLR-15075: Solr docker gradle improvements (#2197)
add 7ecdea2 SOLR-15075: Remove docker gradle artifact
add 867e486 SOLR: Remove CHANGES.md; use solr/CHANGES.txt
No new revisions were added by this update.
Summary of changes:
.github/workflows/docker-test.yml | 46 +
build.gradle | 2 +-
dev-tools/scripts/addVersion.py | 1 +
gradle/help.gradle | 1 +
.../apache/lucene/store/NRTCachingDirectory.java | 4 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 2 -
.../apache/lucene/store/MockDirectoryWrapper.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 13 +-
.../org/apache/lucene/util/TestSysoutsLimits.java | 2 -
settings.gradle | 2 -
solr/CHANGES.txt | 76 +
solr/bin/jetty.sh | 4 +-
solr/bin/solr | 39 +-
.../AbstractDataImportHandlerTestCase.java | 2 +-
solr/contrib/prometheus-exporter/bin/solr-exporter | 36 +-
.../prometheus-exporter/bin/solr-exporter.cmd | 14 +-
.../solr/prometheus/exporter/SolrExporter.java | 4 +-
.../client/solrj/embedded/EmbeddedSolrServer.java | 14 +-
.../client/solrj/embedded/JettySolrRunner.java | 11 +-
.../src/java/org/apache/solr/cloud/CloudUtil.java | 19 -
.../java/org/apache/solr/cloud/DistributedMap.java | 8 +-
.../org/apache/solr/cloud/ElectionContext.java | 8 +-
.../java/org/apache/solr/cloud/LeaderElector.java | 325 +--
.../src/java/org/apache/solr/cloud/Overseer.java | 191 +-
.../apache/solr/cloud/OverseerElectionContext.java | 13 +-
.../solr/cloud/OverseerTaskExecutorTask.java | 67 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 8 +-
.../org/apache/solr/cloud/OverseerTaskQueue.java | 9 +-
.../solr/cloud/RecoveringCoreTermWatcher.java | 10 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 268 +--
.../solr/cloud/ShardLeaderElectionContext.java | 94 +-
.../solr/cloud/ShardLeaderElectionContextBase.java | 171 +-
.../solr/cloud/SizeLimitedDistributedMap.java | 7 +-
.../java/org/apache/solr/cloud/StatePublisher.java | 92 +-
.../org/apache/solr/cloud/ZkCollectionTerms.java | 13 +-
.../java/org/apache/solr/cloud/ZkController.java | 430 ++--
.../org/apache/solr/cloud/ZkDistributedQueue.java | 8 +-
.../java/org/apache/solr/cloud/ZkShardTerms.java | 150 +-
.../apache/solr/cloud/ZkSolrResourceLoader.java | 2 +-
.../solr/cloud/api/collections/AddReplicaCmd.java | 2 +-
.../cloud/api/collections/CreateCollectionCmd.java | 20 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 13 +-
.../solr/cloud/api/collections/MigrateCmd.java | 3 +-
.../OverseerCollectionMessageHandler.java | 3 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 2 +-
.../apache/solr/cloud/overseer/OverseerAction.java | 5 +-
.../apache/solr/cloud/overseer/ZkStateWriter.java | 358 ++--
.../apache/solr/core/CachingDirectoryFactory.java | 182 +-
.../java/org/apache/solr/core/CoreContainer.java | 538 ++---
.../apache/solr/core/CorePropertiesLocator.java | 4 +-
.../org/apache/solr/core/QuerySenderListener.java | 5 +-
.../src/java/org/apache/solr/core/SolrCore.java | 108 +-
.../src/java/org/apache/solr/core/SolrCores.java | 32 +-
.../src/java/org/apache/solr/core/ZkContainer.java | 2 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 25 +-
.../apache/solr/handler/RequestHandlerBase.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 7 +-
.../solr/handler/admin/CoreAdminHandler.java | 1 +
.../solr/handler/admin/CoreAdminOperation.java | 58 +-
.../apache/solr/handler/admin/PrepRecoveryOp.java | 43 +-
.../org/apache/solr/handler/admin/SplitOp.java | 2 +-
.../solr/handler/component/HttpShardHandler.java | 2 +-
.../handler/component/RealTimeGetComponent.java | 24 +-
.../org/apache/solr/metrics/SolrMetricManager.java | 2 +-
.../java/org/apache/solr/pkg/PackageListeners.java | 2 +-
.../apache/solr/request/LocalSolrQueryRequest.java | 29 +-
.../java/org/apache/solr/schema/IndexSchema.java | 10 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 22 +-
.../apache/solr/schema/ZkIndexSchemaReader.java | 8 +-
.../apache/solr/servlet/DirectSolrConnection.java | 3 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 14 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 11 +-
.../org/apache/solr/servlet/SolrQoSFilter.java | 102 +-
.../java/org/apache/solr/servlet/StopJetty.java | 2 +-
.../apache/solr/spelling/SpellCheckCollator.java | 2 -
.../org/apache/solr/update/AddUpdateCommand.java | 10 +-
.../java/org/apache/solr/update/CommitTracker.java | 2 +-
.../apache/solr/update/DefaultSolrCoreState.java | 36 +-
.../apache/solr/update/DirectUpdateHandler2.java | 3 +-
.../java/org/apache/solr/update/HdfsUpdateLog.java | 3 +-
.../src/java/org/apache/solr/update/PeerSync.java | 100 +-
.../org/apache/solr/update/PeerSyncWithLeader.java | 49 +-
.../org/apache/solr/update/SolrCmdDistributor.java | 30 +-
.../java/org/apache/solr/update/SolrCoreState.java | 6 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 2 +-
.../org/apache/solr/update/SolrIndexWriter.java | 22 +-
.../org/apache/solr/update/TimedVersionBucket.java | 2 +-
.../java/org/apache/solr/update/UpdateHandler.java | 84 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 111 +-
.../java/org/apache/solr/update/VersionBucket.java | 2 +-
.../java/org/apache/solr/update/VersionInfo.java | 2 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 4 +-
.../processor/DistributedUpdateProcessor.java | 119 +-
.../processor/DistributedZkUpdateProcessor.java | 19 +-
.../solr/util/plugin/AbstractPluginLoader.java | 7 +-
solr/core/src/test-files/log4j2.xml | 2 +-
.../configsets/configset-2/conf/solrconfig.xml | 2 +-
.../apache/solr/AnalysisAfterCoreReloadTest.java | 1 +
.../src/test/org/apache/solr/CursorPagingTest.java | 6 +-
.../test/org/apache/solr/TestCrossCoreJoin.java | 2 +
solr/core/src/test/org/apache/solr/TestTrie.java | 2 +
.../embedded/TestEmbeddedSolrServerSchemaAPI.java | 3 +
.../test/org/apache/solr/cloud/AddReplicaTest.java | 2 +-
.../apache/solr/cloud/BasicDistributedZk2Test.java | 2 +-
.../org/apache/solr/cloud/DeleteReplicaTest.java | 42 +-
.../org/apache/solr/cloud/DeleteStatusTest.java | 2 +-
.../org/apache/solr/cloud/LeaderElectionTest.java | 7 +-
.../solr/cloud/MissingSegmentRecoveryTest.java | 2 +
.../org/apache/solr/cloud/MoveReplicaTest.java | 2 +
.../apache/solr/cloud/MultiThreadedOCPTest.java | 328 ---
.../test/org/apache/solr/cloud/OverseerTest.java | 2 +-
.../apache/solr/cloud/PeerSyncReplicationTest.java | 2 +-
.../apache/solr/cloud/ReplicationFactorTest.java | 2 +-
.../apache/solr/cloud/ShardRoutingCustomTest.java | 2 +-
.../test/org/apache/solr/cloud/SyncSliceTest.java | 2 +-
.../apache/solr/cloud/TestCloudDeleteByQuery.java | 4 -
.../cloud/TestDeleteCollectionOnDownNodes.java | 7 +-
.../org/apache/solr/cloud/TestDistributedMap.java | 14 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 2 +-
.../org/apache/solr/cloud/TestSegmentSorting.java | 2 +-
.../solr/cloud/TestSizeLimitedDistributedMap.java | 5 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 7 +
.../CollectionsAPIDistributedZkTest.java | 1 +
.../CreateCollectionsIndexAndRestartTest.java | 16 +-
.../org/apache/solr/core/RequestHandlersTest.java | 2 +-
.../org/apache/solr/core/ResourceLoaderTest.java | 2 +-
.../src/test/org/apache/solr/core/TestConfig.java | 54 +-
.../org/apache/solr/core/TestCoreContainer.java | 1 -
.../apache/solr/core/TestCorePropertiesReload.java | 3 +-
.../test/org/apache/solr/core/TestInitParams.java | 29 +-
.../test/org/apache/solr/core/TestLazyCores.java | 2 +-
.../apache/solr/core/TestMergePolicyConfig.java | 1 +
.../apache/solr/core/TestReloadAndDeleteDocs.java | 10 +-
.../apache/solr/core/TestSolrConfigHandler.java | 3 +-
.../handler/FieldAnalysisRequestHandlerTest.java | 2 +
.../solr/handler/MoreLikeThisHandlerTest.java | 2 +
.../solr/handler/TestSystemCollAutoCreate.java | 2 +
.../component/MoreLikeThisComponentTest.java | 6 +-
.../solr/handler/component/StatsComponentTest.java | 2 +
.../apache/solr/schema/ChangedSchemaMergeTest.java | 28 +-
.../test/org/apache/solr/schema/CopyFieldTest.java | 12 +-
.../test/org/apache/solr/schema/DocValuesTest.java | 17 +-
.../solr/schema/IndexSchemaRuntimeFieldTest.java | 3 +-
.../org/apache/solr/schema/IndexSchemaTest.java | 71 +-
.../solr/schema/TestSchemalessBufferedUpdates.java | 13 +-
.../apache/solr/schema/TestSortableTextField.java | 103 +-
.../org/apache/solr/search/CursorMarkTest.java | 17 +-
.../org/apache/solr/search/QueryParsingTest.java | 2 +
.../org/apache/solr/search/ReturnFieldsTest.java | 67 +-
.../org/apache/solr/search/TestRangeQuery.java | 2 +-
.../org/apache/solr/search/TestRealTimeGet.java | 1 +
.../test/org/apache/solr/search/TestRecovery.java | 2 +-
.../test/org/apache/solr/search/TestReload.java | 10 +-
.../org/apache/solr/search/join/BJQParserTest.java | 9 +-
.../solr/search/join/TestScoreJoinQPScore.java | 37 +-
.../apache/solr/search/stats/TestDistribIDF.java | 1 +
.../solr/spelling/SpellCheckCollatorTest.java | 2 +
.../solr/spelling/suggest/SuggesterFSTTest.java | 2 +
.../solr/spelling/suggest/SuggesterTSTTest.java | 2 +
.../solr/spelling/suggest/SuggesterTest.java | 2 +
.../solr/spelling/suggest/SuggesterWFSTTest.java | 2 +
.../solr/update/DirectUpdateHandlerTest.java | 2 +
.../apache/solr/update/MockingHttp2SolrClient.java | 2 +-
.../apache/solr/update/SolrIndexMetricsTest.java | 2 +
.../StatelessScriptUpdateProcessorFactoryTest.java | 2 +
.../org/apache/solr/util/SolrPluginUtilsTest.java | 1 +
solr/docker/Dockerfile | 46 +-
solr/docker/README.md | 2 +-
solr/docker/build.gradle | 201 +-
solr/docker/gradle-help.txt | 80 +
solr/docker/package/Dockerfile.local-package | 3 -
solr/docker/package/Dockerfile.release-package | 74 -
solr/docker/package/build.gradle | 36 -
.../{include => }/scripts/docker-entrypoint.sh | 3 +
solr/docker/{include => }/scripts/init-var-solr | 16 +-
solr/docker/{include => }/scripts/oom_solr.sh | 0
solr/docker/{include => }/scripts/precreate-core | 0
solr/docker/{include => }/scripts/run-initdb | 0
solr/docker/{include => }/scripts/solr-create | 3 -
solr/docker/{include => }/scripts/solr-demo | 0
solr/docker/{include => }/scripts/solr-fg | 0
solr/docker/{include => }/scripts/solr-foreground | 3 -
solr/docker/{include => }/scripts/solr-precreate | 3 -
solr/docker/{include => }/scripts/start-local-solr | 0
solr/docker/{include => }/scripts/stop-local-solr | 0
solr/docker/{include => }/scripts/wait-for-solr.sh | 0
.../{include => }/scripts/wait-for-zookeeper.sh | 0
.../cases/empty-varsolr-vol-solr-nocopy/test.sh | 1 +
solr/docker/tests/cases/gosu/test.sh | 2 +-
solr/docker/tests/cases/version/test.sh | 45 -
solr/reference-branch/bench/solr-benchmark.jar | Bin 37946 -> 37932 bytes
solr/server/etc/jetty-https.xml | 2 +-
solr/server/etc/jetty-https8.xml | 5 +
solr/server/etc/jetty.xml | 8 +-
solr/server/resources/log4j2.xml | 12 +-
.../src/major-changes-in-solr-9.adoc | 2 +
...onitoring-solr-with-prometheus-and-grafana.adoc | 47 +-
.../client/solrj/impl/CloudHttp2SolrClient.java | 2 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 35 +-
.../solr/client/solrj/impl/LBHttp2SolrClient.java | 10 +-
.../solr/client/solrj/impl/LBHttpSolrClient.java | 1 +
.../solr/client/solrj/impl/LBSolrClient.java | 16 +-
.../client/solrj/request/CoreAdminRequest.java | 47 +-
.../solr/client/solrj/util/AsyncListener.java | 2 +-
.../src/java/org/apache/solr/common/ParWork.java | 29 +-
.../org/apache/solr/common/ParWorkExecutor.java | 4 +-
.../apache/solr/common/PerThreadExecService.java | 72 +-
.../java/org/apache/solr/common/cloud/Replica.java | 4 +
.../apache/solr/common/cloud/SolrZooKeeper.java | 6 +-
.../apache/solr/common/cloud/ZkStateReader.java | 355 ++--
.../solr/common/util/SolrQueuedThreadPool.java | 6 +-
.../java/org/apache/solr/common/util/SysStats.java | 40 +-
.../org/apache/solr/logging/MDCLoggingContext.java | 105 +-
.../org/apache/zookeeper/ZooKeeperExposed.java | 2 +-
.../org/apache/solr/SolrIgnoredThreadsFilter.java | 11 +-
.../src/java/org/apache/solr/SolrTestCase.java | 1 +
.../src/java/org/apache/solr/SolrTestCaseHS.java | 9 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 45 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 3 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 47 +-
.../src/java/org/apache/solr/util/TestHarness.java | 36 +-
.../apache/zookeeper/server/ZooKeeperServer.java | 2081 --------------------
.../src/resources/logconf/log4j2-startup-debug.xml | 8 +-
.../src/resources/logconf/log4j2-std-debug.xml | 9 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 55 -
225 files changed, 3583 insertions(+), 5489 deletions(-)
create mode 100644 .github/workflows/docker-test.yml
delete mode 100644 solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java
create mode 100644 solr/docker/gradle-help.txt
delete mode 100644 solr/docker/package/Dockerfile.local-package
delete mode 100644 solr/docker/package/Dockerfile.release-package
delete mode 100644 solr/docker/package/build.gradle
rename solr/docker/{include => }/scripts/docker-entrypoint.sh (92%)
rename solr/docker/{include => }/scripts/init-var-solr (81%)
rename solr/docker/{include => }/scripts/oom_solr.sh (100%)
rename solr/docker/{include => }/scripts/precreate-core (100%)
rename solr/docker/{include => }/scripts/run-initdb (100%)
rename solr/docker/{include => }/scripts/solr-create (94%)
rename solr/docker/{include => }/scripts/solr-demo (100%)
rename solr/docker/{include => }/scripts/solr-fg (100%)
rename solr/docker/{include => }/scripts/solr-foreground (67%)
rename solr/docker/{include => }/scripts/solr-precreate (88%)
rename solr/docker/{include => }/scripts/start-local-solr (100%)
rename solr/docker/{include => }/scripts/stop-local-solr (100%)
rename solr/docker/{include => }/scripts/wait-for-solr.sh (100%)
rename solr/docker/{include => }/scripts/wait-for-zookeeper.sh (100%)
delete mode 100755 solr/docker/tests/cases/version/test.sh
rename solr/{core => solrj}/src/java/org/apache/solr/logging/MDCLoggingContext.java (53%)
delete mode 100644 solr/test-framework/src/java/org/apache/zookeeper/server/ZooKeeperServer.java