This is an automated email from the ASF dual-hosted git repository.
noble pushed a change to branch jira/17134
in repository https://gitbox.apache.org/repos/asf/solr.git
from 1a69747181b support multiple request types
add 0261983dc73 Tweak test to eliminate assumption about doc order in
index that can cause random failures
add 3837eebcd73 SOLR-17300: Ensure listeners are copied when re-creating
Http2SolrClient using withHttpClient (#2467)
add 0551589dffb SOLR-12813 followup -- preserve user Principal in
alternate codepath in EmbeddedSolrServer (#2429)
add f90e9072629 Clarify the cache behavior in the Ref Guide (#2472)
add 6d945eb75f4 Admin UI: fixed node list display bug caused by different
hostname with same front part (duplicates PR #2449) (#2475)
add 917e682d269 SOLR-17307: Use file separator instead of '/' in
CachingDirectoryFactory (#2464)
add 0827de2f691 Http2SolrClient micro cleanups (#2453)
add fd3f7d2bacd Build: gradlew avoid downloader (#2419)
add 8bbfbdbc469 SOLR-16659: Properly construct V2 base urls instead of
replacing substring "/solr" with "/api" (#2473)
add f5b36c8a819 SOLR-17284: Remove deprecated BlobRepository (#2447)
add 281c77c5f5f track changes in SOLR-17284
add 2b28161cc56 SOLR-17290: Update SyncStrategy and PeerSyncWithLeader to
use the recovery Http2SolrClient (#2460)
add e923ca51033 SOLR-17277: Add 'warnOnly' mode to CircuitBreakers (#2476)
add 2af21395ae2 Document 'warnOnly' CBs in CHANGES.txt
add 8c5ae1bb745 SOLR-17302: Convert /cluster filestore APIs to JAX-RS
(#2470)
add 437e27970b2 SOLR-17044: Consolidate SolrJ URL-building logic (#2455)
add 14a219542bd SOLR-17247: Fix bug - 'WWW-Authenticate' headers missing
in MultiAuthPlugin (#2416)
add ce683829be5 Temporary fix for SearchHandlerTest
add e08661d6ba7 DOAP changes for release 9.6.1
add b16e961f297 Sync CHANGES for 9.6.1
add 88144814b26 Revert "SOLR-17302: Convert /cluster filestore APIs to
JAX-RS (#2470)"
add d7103d51e3f Update dependency commons-cli:commons-cli to v1.8.0 (#2481)
add 5bee23c9dea SOLR-17137 - Add configuration for SSL between Solr and
Prometheus exporter. (#2232)
add adccb8d50b9 Move setShardAttributesToParams (#2486)
add 52042187f76 SOLR-16093: Tests: don't require IPv6 (#2484)
add bc7fceeb7d7 SOLR-17271: PerReplicaState: Shard leader elections still
impact state.json (#2443)
add 686b1122350 Merge branch 'main' into jira/17134 merging with main
No new revisions were added by this update.
Summary of changes:
dev-tools/doap/solr.rdf | 7 +
.../randomization/policies/solr-tests.policy | 6 +-
gradlew | 18 +-
gradlew.bat | 10 +-
solr/CHANGES.txt | 35 +-
.../client/solrj/embedded/EmbeddedSolrServer.java | 3 +-
.../java/org/apache/solr/cloud/SyncStrategy.java | 14 +-
.../apache/solr/cloud/overseer/SliceMutator.java | 4 +
.../java/org/apache/solr/core/BlobRepository.java | 367 ---------------------
.../apache/solr/core/CachingDirectoryFactory.java | 7 +-
.../java/org/apache/solr/core/CoreContainer.java | 6 -
.../src/java/org/apache/solr/core/SolrCore.java | 35 --
.../apache/solr/filestore/DistribFileStore.java | 22 +-
.../org/apache/solr/filestore/FileStoreAPI.java | 3 +-
.../solr/handler/ContentStreamHandlerBase.java | 14 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 2 -
.../solr/handler/component/SearchHandler.java | 15 +-
.../solr/handler/component/ShardHandler.java | 15 +
.../handler/component/TaskManagementHandler.java | 2 +-
.../apache/solr/packagemanager/PackageUtils.java | 3 +-
.../solr/packagemanager/RepositoryManager.java | 5 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 12 +-
.../org/apache/solr/security/MultiAuthPlugin.java | 26 ++
.../org/apache/solr/update/PeerSyncWithLeader.java | 26 +-
.../util/circuitbreaker/CPUCircuitBreaker.java | 11 +
.../solr/util/circuitbreaker/CircuitBreaker.java | 12 +
.../circuitbreaker/CircuitBreakerRegistry.java | 41 ++-
.../util/circuitbreaker/CircuitBreakerUtils.java | 73 ++++
.../circuitbreaker/LoadAverageCircuitBreaker.java | 11 +
.../util/circuitbreaker/MemoryCircuitBreaker.java | 11 +
.../solr/configsets/resource-sharing/schema.xml | 21 --
.../configsets/resource-sharing/solrconfig.xml | 51 ---
.../solr/security/multi_auth_plugin_security.json | 6 +
.../apache/solr/cloud/AliasIntegrationTest.java | 7 +-
.../org/apache/solr/cloud/MigrateReplicasTest.java | 4 +-
.../apache/solr/cloud/RecoveryZkTestWithAuth.java | 121 +++++++
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 10 +-
.../apache/solr/core/BlobRepositoryCloudTest.java | 127 -------
.../solr/core/BlobRepositoryMockingTest.java | 191 -----------
.../solr/core/CachingDirectoryFactoryTest.java | 24 +-
.../apache/solr/core/TestShardHandlerFactory.java | 26 ++
.../solr/filestore/TestDistribFileStore.java | 4 +-
.../apache/solr/handler/TestContainerPlugin.java | 2 +-
.../solr/handler/admin/HealthCheckHandlerTest.java | 28 +-
.../solr/handler/admin/ZookeeperReadAPITest.java | 6 +-
.../component/ResourceSharingTestComponent.java | 142 --------
.../solr/handler/component/SearchHandlerTest.java | 1 +
.../handler/designer/TestSchemaDesignerAPI.java | 2 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 3 +-
.../solr/search/TestReRankQParserPlugin.java | 12 +-
.../solr/security/AuditLoggerIntegrationTest.java | 5 +-
.../apache/solr/security/MultiAuthPluginTest.java | 43 +++
.../org/apache/solr/util/TestCircuitBreakers.java | 72 ++++
solr/licenses/commons-cli-1.7.0.jar.sha1 | 1 -
solr/licenses/commons-cli-1.8.0.jar.sha1 | 1 +
solr/packaging/build.gradle | 1 +
solr/packaging/test/bats_helper.bash | 7 +-
.../{test_create.bats => test_prometheus.bats} | 22 +-
solr/prometheus-exporter/bin/solr-exporter | 8 +
solr/prometheus-exporter/bin/solr-exporter.cmd | 2 +
.../prometheus/exporter/SolrClientFactory.java | 11 +
.../solr/prometheus/exporter/SolrExporter.java | 30 ++
.../exporter/SolrScrapeConfiguration.java | 39 +++
solr/server/etc/security.policy | 4 -
.../configuration-guide/pages/caches-warming.adoc | 19 +-
.../deployment-guide/pages/circuit-breakers.adoc | 13 +-
.../monitoring-with-prometheus-and-grafana.adoc | 11 +
.../pages/major-changes-in-solr-10.adoc | 4 +
.../apache/solr/common/cloud/ZkStateReader.java | 25 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 46 +--
.../solr/client/solrj/impl/HttpJdkSolrClient.java | 2 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 37 +--
.../solr/client/solrj/impl/HttpSolrClientBase.java | 29 +-
.../solr/client/solrj/impl/LBSolrClient.java | 4 +-
.../apache/solr/client/solrj/util/ClientUtils.java | 52 +++
.../solr/common/params/ModifiableSolrParams.java | 13 -
.../java/org/apache/solr/common/util/Utils.java | 51 +++
.../solr/client/solrj/util/ClientUtilsTest.java | 56 ++++
.../cloud/PerReplicaStatesIntegrationTest.java | 48 ++-
.../common/params/ModifiableSolrParamsTest.java | 19 --
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 6 +-
solr/webapp/web/js/angular/controllers/cloud.js | 6 +-
versions.lock | 2 +-
versions.props | 2 +-
84 files changed, 1030 insertions(+), 1265 deletions(-)
delete mode 100644 solr/core/src/java/org/apache/solr/core/BlobRepository.java
create mode 100644
solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerUtils.java
delete mode 100644
solr/core/src/test-files/solr/configsets/resource-sharing/schema.xml
delete mode 100644
solr/core/src/test-files/solr/configsets/resource-sharing/solrconfig.xml
create mode 100644
solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java
delete mode 100644
solr/core/src/test/org/apache/solr/core/BlobRepositoryCloudTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java
delete mode 100644 solr/licenses/commons-cli-1.7.0.jar.sha1
create mode 100644 solr/licenses/commons-cli-1.8.0.jar.sha1
copy solr/packaging/test/{test_create.bats => test_prometheus.bats} (67%)
