This is an automated email from the ASF dual-hosted git repository. jdyer pushed a commit to branch feature/SOLR-17516-c in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4c4c97573cf100362d7c0db644e4dfde509c099a Merge: 565cfad4373 e5d15cc84f8 Author: jdyer1 <[email protected]> AuthorDate: Thu Oct 31 09:48:17 2024 -0500 Merge branch 'main' into feature/SOLR-17516-c .../randomization/policies/solr-tests.policy | 2 + solr/CHANGES.txt | 18 +- solr/bin/solr | 3 +- solr/bin/solr.cmd | 252 +------- solr/core/build.gradle | 11 +- .../src/java/org/apache/solr/cli/ExportTool.java | 35 +- .../src/java/org/apache/solr/cli/PostTool.java | 11 +- .../java/org/apache/solr/cli/RunExampleTool.java | 2 +- .../java/org/apache/solr/cloud/LeaderElector.java | 7 +- .../src/java/org/apache/solr/cloud/Overseer.java | 20 +- .../apache/solr/cloud/OverseerTaskProcessor.java | 11 +- .../solr/cloud/ShardLeaderElectionContextBase.java | 54 +- .../java/org/apache/solr/cloud/ZkController.java | 67 +-- .../org/apache/solr/cloud/ZkDistributedQueue.java | 31 +- .../java/org/apache/solr/cloud/ZkShardTerms.java | 15 +- .../src/java/org/apache/solr/core/ZkContainer.java | 3 +- .../solr/handler/component/SearchHandler.java | 4 +- .../org/apache/solr/servlet/BaseSolrServlet.java | 32 - .../solr/servlet/CheckLoggingConfiguration.java | 37 -- .../apache/solr/servlet/LoadAdminUiServlet.java | 11 +- .../org/apache/solr/servlet/RedirectServlet.java | 3 +- .../java/org/apache/solr/servlet/ServletUtils.java | 96 ++- .../apache/solr/servlet/SolrDispatchFilter.java | 32 +- .../org/apache/solr/update/SolrIndexSplitter.java | 15 +- .../processor/DistributedZkUpdateProcessor.java | 2 +- .../solr/configsets/cloud-minimal/conf/schema.xml | 2 + .../test/org/apache/solr/cli/TestExportTool.java | 4 +- .../org/apache/solr/cli/ZkSubcommandsTest.java | 10 +- .../apache/solr/cloud/ConnectionManagerTest.java | 186 ------ .../apache/solr/cloud/DistributedQueueTest.java | 23 +- .../org/apache/solr/cloud/LeaderElectionTest.java | 72 ++- .../apache/solr/cloud/MultiThreadedOCPTest.java | 3 +- .../OutOfBoxZkACLAndCredentialsProvidersTest.java | 2 +- ...OverriddenZkACLAndCredentialsProvidersTest.java | 174 +++--- .../test/org/apache/solr/cloud/OverseerTest.java | 11 +- .../apache/solr/cloud/RecoveryZkTestWithAuth.java | 10 + .../test/org/apache/solr/cloud/SplitShardTest.java | 71 ++- .../solr/cloud/TestLeaderElectionZkExpiry.java | 3 +- .../solr/cloud/TestPullReplicaErrorHandling.java | 2 + .../solr/cloud/TestSizeLimitedDistributedMap.java | 3 +- .../org/apache/solr/cloud/ZkSolrClientTest.java | 63 +- .../solr/cloud/overseer/ZkStateWriterTest.java | 9 +- .../metrics/reporters/SolrJmxReporterTest.java | 35 +- .../apache/solr/update/SolrIndexSplitterTest.java | 131 +++- ...ent-LICENSE-ASL.txt => curator-LICENSE-ASL.txt} | 0 ...urator-client-NOTICE.txt => curator-NOTICE.txt} | 0 solr/licenses/curator-client-5.7.0.jar.sha1 | 1 - solr/licenses/curator-client-5.7.1.jar.sha1 | 1 + solr/licenses/curator-framework-5.7.0.jar.sha1 | 1 - solr/licenses/curator-framework-5.7.1.jar.sha1 | 1 + solr/licenses/curator-framework-LICENSE-ASL.txt | 202 ------- solr/licenses/curator-framework-NOTICE.txt | 5 - solr/licenses/curator-recipes-5.7.0.jar.sha1 | 1 - solr/licenses/curator-recipes-5.7.1.jar.sha1 | 1 + solr/licenses/curator-recipes-NOTICE.txt | 5 - solr/licenses/curator-test-5.7.1.jar.sha1 | 1 + solr/licenses/junit-jupiter-api-5.6.2.jar.sha1 | 1 + .../licenses/junit-platform-commons-1.6.2.jar.sha1 | 1 + solr/licenses/log4j-jul-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-jul-LICENSE-ASL.txt | 201 ------- solr/licenses/log4j-jul-NOTICE.txt | 17 - solr/licenses/opentest4j-1.2.0.jar.sha1 | 1 + ...-LICENSE-ASL.txt => opentest4j-LICENSE-ASL.txt} | 8 +- solr/licenses/opentest4j-NOTICE.txt | 13 + solr/modules/hadoop-auth/build.gradle | 19 +- .../hadoop/DelegationTokenKerberosFilter.java | 129 +--- .../solr/security/hadoop/HadoopAuthFilter.java | 126 +--- .../solr/security/hadoop/HadoopAuthPlugin.java | 2 + .../solr/security/hadoop/KerberosPlugin.java | 3 + .../security/hadoop/SaslZkACLProviderTest.java | 8 +- .../hadoop/TestImpersonationWithHadoopAuth.java | 3 +- .../hadoop/TestSolrCloudWithDelegationTokens.java | 9 +- solr/packaging/test/test_basic_auth.bats | 2 +- solr/packaging/test/test_export.bats | 18 +- solr/packaging/test/test_post.bats | 12 + solr/packaging/test/test_start_solr.bats | 21 +- solr/server/build.gradle | 1 - solr/server/etc/jetty.xml | 2 + .../pages/collection-management.adoc | 1 + .../modules/deployment-guide/pages/node-roles.adoc | 2 +- .../pages/solr-control-script-reference.adoc | 28 +- .../pages/solrcloud-shards-indexing.adoc | 2 +- .../pages/indexing-nested-documents.adoc | 6 +- .../indexing-guide/pages/indexing-with-tika.adoc | 2 +- .../modules/indexing-guide/pages/post-tool.adoc | 11 +- solr/solrj-zookeeper/build.gradle | 7 + .../client/solrj/cloud/DistribStateManager.java | 6 +- .../client/solrj/impl/ZkDistribStateManager.java | 7 +- .../apache/solr/common/cloud/BeforeReconnect.java | 13 +- .../solr/common/cloud/ConnectionManager.java | 318 ---------- .../common/cloud/DefaultConnectionStrategy.java | 74 --- .../solr/common/cloud/DefaultZkACLProvider.java | 32 +- .../common/cloud/DefaultZkCredentialsProvider.java | 21 +- .../common/cloud/DigestZkCredentialsProvider.java | 17 +- .../apache/solr/common/cloud/OnDisconnect.java} | 21 +- .../org/apache/solr/common/cloud/OnReconnect.java | 22 +- .../solr/common/cloud/PerReplicaStatesOps.java | 10 +- .../solr/common/cloud/SaslZkACLProvider.java | 4 +- .../common/cloud/SecurityAwareZkACLProvider.java | 52 +- .../org/apache/solr/common/cloud/SolrZkClient.java | 666 ++++++++++++--------- ...eSetCredentialsDigestZkCredentialsProvider.java | 5 +- .../apache/solr/common/cloud/ZkACLProvider.java | 8 +- .../common/cloud/ZkClientConnectionStrategy.java | 155 ----- .../apache/solr/common/cloud/ZkCmdExecutor.java | 103 ---- .../solr/common/cloud/ZkCredentialsProvider.java | 25 +- .../apache/solr/common/cloud/ZkStateReader.java | 10 +- .../apache/solr/common/cloud/SolrZkClientTest.java | 39 +- .../solr/common/cloud/TestZkConfigSetService.java | 90 ++- .../solr/client/solrj/impl/Http2SolrClient.java | 10 + .../client/solrj/impl/SolrZkClientTimeout.java | 2 + .../cloud/PerReplicaStatesIntegrationTest.java | 1 + .../cloud/SolrZkClientCompressedDataTest.java | 5 +- solr/test-framework/build.gradle | 12 + .../org/apache/solr/SolrIgnoredThreadsFilter.java | 5 + .../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 - ...DigestZkACLAndCredentialsProvidersTestBase.java | 6 +- .../java/org/apache/solr/cloud/ChaosMonkey.java | 23 +- .../apache/solr/cloud/MiniSolrCloudCluster.java | 10 +- .../apache/solr/cloud/TestConnectionStrategy.java | 35 -- .../java/org/apache/solr/cloud/ZkTestServer.java | 57 +- versions.lock | 24 +- versions.props | 2 +- 122 files changed, 1451 insertions(+), 2905 deletions(-)
