Merge branch 'main' into improvements/cli-utils

# Conflicts: # solr/core/src/java/org/apache/solr/cli/AssertTool.java # solr/core/src/java/org/apache/solr/cli/ClusterTool.java # solr/core/src/java/org/apache/solr/cli/ConfigSetDownloadTool.java # solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java # solr/core/src/java/org/apache/solr/cli/ConfigTool.java # solr/core/src/java/org/apache/solr/cli/CreateTool.java # solr/core/src/java/org/apache/solr/cli/DeleteTool.java # solr/core/src/java/org/apache/solr/cli/ExportTool.java # solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java # solr/core/src/java/org/apache/solr/cli/LinkConfigTool.java # solr/core/src/java/org/apache/solr/cli/PostLogsTool.java # solr/core/src/java/org/apache/solr/cli/PostTool.java # solr/core/src/java/org/apache/solr/cli/RunExampleTool.java # solr/core/src/java/org/apache/solr/cli/SnapshotCreateTool.java # solr/core/src/java/org/apache/solr/cli/SnapshotDeleteTool.java # solr/core/src/java/org/apache/solr/cli/SnapshotDescribeTool.java # solr/core/src/java/org/apache/solr/cli/SnapshotListTool.java # solr/core/src/java/org/apache/solr/cli/SolrCLI.java # solr/core/src/java/org/apache/solr/cli/ZkCpTool.java # solr/core/src/java/org/apache/solr/cli/ZkLsTool.java # solr/core/src/java/org/apache/solr/cli/ZkMkrootTool.java # solr/core/src/java/org/apache/solr/cli/ZkMvTool.java # solr/core/src/java/org/apache/solr/cli/ZkRmTool.java
apache · Nov 11, 2024 · 744b0a6 · 744b0a6
2 parents 9e35099 + 125fc3f
commit 744b0a6
Show file tree

Hide file tree

Showing 123 changed files with 2,649 additions and 2,240 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Solr is the blazing-fast, open source, multi-modal search platform built on [Apa
 It powers full-text, vector, and geospatial search at many of the world's largest organizations.
 
 [![Build Status](https://ci-builds.apache.org/job/Solr/job/Solr-Artifacts-main/badge/icon?subject=Solr%20Artifacts)](https://ci-builds.apache.org/job/Solr/job/Solr-Artifacts-main/)
-[![Build Status](https://ci-builds.apache.org/job/Solr/job/Solr-Check-main/badge/icon?subject=Solr%20Check)](https://ci-builds.apache.org/job/Solr/job/Solr-Check-main/)
+[![Build Status](https://ci-builds.apache.org/job/Solr/job/Solr-Lint-main/badge/icon?subject=Solr%20Lint)](https://ci-builds.apache.org/job/Solr/job/Solr-Lint-main/)
 
 For a complete description of the Solr project, team composition, source
 code repositories, and other details, please see the Solr web site at

diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java
@@ -22,7 +22,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -54,7 +54,7 @@ public static void main(String[] args) {
   }
 
   public static void checkVersion() {
-    int major = Runtime.getRuntime().version().feature();
+    int major = Runtime.version().feature();
     if (major < 21 || major > 23) {
       throw new IllegalStateException(
           "java version must be between 21 and 23, your version: " + major);
@@ -89,12 +89,12 @@ public void run(Path destination) throws IOException, NoSuchAlgorithmException {
       }
     }
 
-    URL url =
-        new URL(
+    URI uri =
+        URI.create(
             "https://raw.githubusercontent.com/gradle/gradle/v"
                 + wrapperVersion
                 + "/gradle/wrapper/gradle-wrapper.jar");
-    System.err.println("Downloading gradle-wrapper.jar from " + url);
+    System.err.println("Downloading gradle-wrapper.jar from " + uri);
 
     // Zero-copy save the jar to a temp file
     Path temp = Files.createTempFile(destination.getParent(), ".gradle-wrapper", ".tmp");
@@ -103,7 +103,7 @@ public void run(Path destination) throws IOException, NoSuchAlgorithmException {
       int retryDelay = 30;
       HttpURLConnection connection;
       while (true) {
-        connection = (HttpURLConnection) url.openConnection();
+        connection = (HttpURLConnection) uri.toURL().openConnection();
         try {
           connection.connect();
         } catch (IOException e) {

diff --git a/dev-docs/asf-jenkins.adoc b/dev-docs/asf-jenkins.adoc
@@ -10,13 +10,14 @@ This file aims to document our [ASF Jenkins](https://ci-builds.apache.org/job/So
 We run a number of jobs on Jenkins, each validating an overlapping set of concerns:
 
 * `Solr-Artifacts-*` - daily jobs that run `./gradlew assemble` to ensure that build artifacts (except docker images) can be created successfully
-* `Solr-check-*` - "hourly" jobs that run all project tests and static analysis (i.e. `test`, `integrationTest`, and `check`)
+* `Solr-Lint-*` - daily jobs that run static analysis (i.e. `precommit` and `check -x test`) on a branch
+* `Solr-Test-*` - "hourly" jobs that run all (non-integration) tests (i.e. `./gradlew test`)
+* `Solr-TestIntegration-*` - daily jobs that run project integration tests (i.e. `./gradlew integrationTests`)
 * `Solr-Docker-Nightly-*` - daily jobs that `./gradlew testDocker dockerPush` to validate docker image packaging.  Snapshot images are pushed to hub.docker.com
-* `Solr-reference-guide-*` - hourly jobs that build the Solr reference guide via `./gradlew checkSite` and push the resulting artifact to the staging/preview site `nightlies.apache.org`
+* `Solr-reference-guide-*` - daily jobs that build the Solr reference guide via `./gradlew checkSite` and push the resulting artifact to the staging/preview site `nightlies.apache.org`
 * `Solr-Smoketest-*` - daily jobs that produce a snapshot release (via the `assembleRelease` task) and run the release smoketester
 
 Most jobs that validate particular build artifacts are run "daily", which is sufficient to prevent any large breaks from creeping into the build.
-
 On the other hand, jobs that run tests are triggered "hourly" in order to squeeze as many test runs as possible out of our Jenkins hardware.
 This is a necessary consequence of Solr's heavy use of randomization in its test-suite.
 "Hourly" scheduling ensures that a test run is either currently running or in the build queue at all times, and enables us to get the maximum data points from our hardware.

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -26,6 +26,10 @@ Improvements
 * SOLR-16116: Apache Curator is now used to manage all Solr Zookeeper interactions. This should provide more stability in the Solr-Zookeeper interactions.
   The solrj-zookeeper module, now has a dependency on curator. (Houston Putman, Kevin Risden, Mike Drob, David Smiley)
 
+* SOLR-17544: Solr CLI will now stop when you combine mutually exclusive options.  Combining -s and -z options is a common example.  (Eric Pugh, Christos Malliaridis)
+
+* SOLR-17495: Change Solr CLI delete command to not delete configs by default.  Decouple lifecycle of collections from configsets. (Eric Pugh)
+
 Optimizations
 ---------------------
 (No changes)
@@ -141,7 +145,7 @@ Improvements
   when PKI is used between nodes. (Jason Gerlowski)
 
 * SOLR-17383: Resolved overlapping arguments in the Solr CLI.  Removed duplicative but differing arguments,
-  consolidated use of short form arguments -v to not have differing meanings based on tool.  Provide deprecation warning 
+  consolidated use of short form arguments -v to not have differing meanings based on tool.  Provide deprecation warning
   in command line when deprecated arguments are used. (Eric Pugh, Christos Malliaridis)
 
 * SOLR-17256: Deprecate SolrRequest `setBasePath` and `getBasePath` methods.  SolrJ users wishing to temporarily
@@ -179,6 +183,8 @@ Optimizations
 
 * SOLR-16503: Switched from HTTP1 to HTTP2 in SolrClientCloudManager by replacing CloudLegacySolrClient with CloudHttp2SolrClient. (Sanjay Dutt, David Smiley)
 
+* SOLR-17453: Leverage waitForState() instead of busy waiting in CREATE, MIGRATE, REINDEXCOLLECTION, MOVEREPLICA commands, and in some tests. (Pierre Salagnac)
+
 Bug Fixes
 ---------------------
 * SOLR-12429: Uploading a configset with a symbolic link produces a IOException. Now a error message to user generated instead. (Eric Pugh)
@@ -221,6 +227,8 @@ led to the suppression of exceptions. (Andrey Bozhko)
 
 * SOLR-17534: Introduce ClusterState.getCollectionNames, a convenience method (David Smiley)
 
+* SOLR-17535: Introduce ClusterState.collectionStream to replace getCollectionStates and getCollectionsMap (David Smiley)
+
 * SOLR-17545: Upgrade to Gradle 8.10 (Houston Putman)
 
 ==================  9.7.1 ==================