From b0da37e17e4a7a942e5605def29a0a5d734858d7 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 11:14:38 -0400
Subject: [PATCH 01/16] Re-introduce support for -p and -port

---
 .../java/org/apache/solr/cli/CreateTool.java  | 20 +++++++++++++++++++
 solr/packaging/test/test_create.bats          | 10 ++++++++++
 2 files changed, 30 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index 6f869e990e5..baff334b20b 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -45,6 +45,7 @@
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.CollectionAdminParams;
 import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.util.EnvUtils;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.ConfigSetService;
 import org.noggit.CharArr;
@@ -148,6 +149,19 @@ public List<Option> getOptions() {
             .required(false)
             .desc("Configuration name; default is the collection name.")
             .build(),
+        Option.builder("p")
+            .longOpt("port")
+            .deprecated(
+                DeprecatedAttributes.builder()
+                    .setForRemoval(true)
+                    .setSince("9.7")
+                    .setDescription("Use --solr-url instead")
+                    .get())
+            .argName("PORT")
+            .hasArg()
+            .required(false)
+            .desc("Port of a local Solr instance where you want to create the new core.")
+            .build(),
         SolrCLI.OPTION_SOLRURL,
         SolrCLI.OPTION_SOLRURL_DEPRECATED,
         SolrCLI.OPTION_ZKHOST,
@@ -158,6 +172,12 @@ public List<Option> getOptions() {
   public void runImpl(CommandLine cli) throws Exception {
     SolrCLI.raiseLogLevelUnlessVerbose(cli);
 
+    // If a port is provided, inject it into the environment variables so
+    // that {@link SolrCLI#getDefaultSolrUrl()} can use it instead of the default 8983.
+    if (cli.hasOption("p")) {
+      EnvUtils.setProperty("jetty.port", cli.getOptionValue("p"));
+    }
+
     try (var solrClient = SolrCLI.getSolrClient(cli)) {
       if (SolrCLI.isCloudMode(solrClient)) {
         createCollection(cli);
diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.bats
index e59a9055852..4658828bba1 100644
--- a/solr/packaging/test/test_create.bats
+++ b/solr/packaging/test/test_create.bats
@@ -39,3 +39,13 @@ teardown() {
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
 }
+
+@test "ensure port parameter is used" {
+  solr start -p ${SOLR2_PORT}
+  solr assert --not-started http://localhost:${SOLR_PORT} --timeout 5000
+  solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000
+  
+  run solr create -c COLL_NAME -p ${SOLR2_PORT}
+  assert_output --partial "Created new core 'COLL_NAME'"
+  
+}

From 2b183337086e2bbdd618c0d29b3b4cf9eb681a7a Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 11:58:56 -0400
Subject: [PATCH 02/16] Now supporting the deprecated -V (versus -v)

This is generating some other refactorings which will be fun to bring to main and 9x seperately!
---
 .../java/org/apache/solr/cli/CreateTool.java    |  9 +++++----
 .../src/java/org/apache/solr/cli/SolrCLI.java   | 14 +++++++++++++-
 .../src/java/org/apache/solr/cli/ToolBase.java  | 15 +++++++++++++--
 solr/packaging/test/test_create.bats            | 17 ++++++++++++++++-
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index baff334b20b..e169d26ce47 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -165,7 +165,8 @@ public List<Option> getOptions() {
         SolrCLI.OPTION_SOLRURL,
         SolrCLI.OPTION_SOLRURL_DEPRECATED,
         SolrCLI.OPTION_ZKHOST,
-        SolrCLI.OPTION_ZKHOST_DEPRECATED);
+        SolrCLI.OPTION_ZKHOST_DEPRECATED,
+        SolrCLI.OPTION_VERBOSE_DEPRECATED);
   }
 
   @Override
@@ -244,12 +245,12 @@ protected void createCore(CommandLine cli, SolrClient solrClient) throws Excepti
 
     try {
       CoreAdminResponse res = CoreAdminRequest.createCore(coreName, coreName, solrClient);
-      if (cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt())) {
+      if (isVerbose()) {
         echo(res.jsonStr());
         echo("\n");
-      } else {
-        echo(String.format(Locale.ROOT, "\nCreated new core '%s'", coreName));
       }
+      echo(String.format(Locale.ROOT, "\nCreated new core '%s'", coreName));
+
     } catch (Exception e) {
       /* create-core failed, cleanup the copied configset before propagating the error. */
       PathUtils.deleteDirectory(coreInstanceDir);
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 2dc25b03556..673b56d2900 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -150,6 +150,17 @@ public class SolrCLI implements CLIO {
           .required(false)
           .desc("Enable verbose command output.")
           .build();
+  public static final Option OPTION_VERBOSE_DEPRECATED =
+      Option.builder("V")
+          .deprecated(
+              DeprecatedAttributes.builder()
+                  .setForRemoval(true)
+                  .setSince("9.7")
+                  .setDescription("Use -v instead")
+                  .get())
+          .required(false)
+          .desc("Enable verbose command output.")
+          .build();
   public static final Option OPTION_HELP =
       Option.builder("h").longOpt("help").required(false).desc("Print this message.").build();
 
@@ -294,7 +305,8 @@ protected static void checkSslStoreSysProp(String solrInstallDir, String key) {
   }
 
   public static void raiseLogLevelUnlessVerbose(CommandLine cli) {
-    if (!cli.hasOption(OPTION_VERBOSE.getOpt())) {
+    if (!(cli.hasOption(OPTION_VERBOSE.getOpt())
+        || cli.hasOption(OPTION_VERBOSE_DEPRECATED.getOpt()))) {
       StartupLoggingUtils.changeLogLevel("WARN");
     }
   }
diff --git a/solr/core/src/java/org/apache/solr/cli/ToolBase.java b/solr/core/src/java/org/apache/solr/cli/ToolBase.java
index 43a42f77d7b..4a87acc104e 100644
--- a/solr/core/src/java/org/apache/solr/cli/ToolBase.java
+++ b/solr/core/src/java/org/apache/solr/cli/ToolBase.java
@@ -34,18 +34,29 @@ protected ToolBase(PrintStream stdout) {
   }
 
   protected void echoIfVerbose(final String msg, CommandLine cli) {
-    if (cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt())) {
+    if (verbose) {
       echo(msg);
     }
   }
 
+  /**
+   * Is this tool being run in a verbose mode?
+   *
+   * @return verbose or not
+   */
+  protected boolean isVerbose() {
+    return verbose;
+  }
+
   protected void echo(final String msg) {
     stdout.println(msg);
   }
 
   @Override
   public int runTool(CommandLine cli) throws Exception {
-    verbose = cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt());
+    verbose =
+        cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt())
+            || cli.hasOption(SolrCLI.OPTION_VERBOSE_DEPRECATED);
 
     int toolExitStatus = 0;
     try {
diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.bats
index 4658828bba1..0eb6df86c69 100644
--- a/solr/packaging/test/test_create.bats
+++ b/solr/packaging/test/test_create.bats
@@ -34,13 +34,19 @@ teardown() {
   assert_output --partial "Created new core 'COLL_NAME'"
 }
 
+@test "create_core works" {
+  run solr start
+  run solr create_core -c COLL_NAME
+  assert_output --partial "Created new core 'COLL_NAME'"
+}
+
 @test "create for cloud mode" {
   run solr start -c
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
 }
 
-@test "ensure port parameter is used" {
+@test "ensure -p port parameter is supported" {
   solr start -p ${SOLR2_PORT}
   solr assert --not-started http://localhost:${SOLR_PORT} --timeout 5000
   solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000
@@ -49,3 +55,12 @@ teardown() {
   assert_output --partial "Created new core 'COLL_NAME'"
   
 }
+
+@test "ensure -V verbose parameter is supported" {
+  solr start 
+  solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
+  
+  run solr create -c COLL_NAME -V
+  assert_output --partial "Created new core 'COLL_NAME'"
+  
+}

From 5c0d2083df771f43c4966ee4451efd34b6c0427f Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 12:43:55 -0400
Subject: [PATCH 03/16] fix a bug in HealthcheckTool itself and how we pass
 parameters in

---
 solr/bin/solr                                        |  2 +-
 .../java/org/apache/solr/cli/HealthcheckTool.java    | 12 +++++++++++-
 solr/packaging/test/test_healthcheck.bats            |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index acb627b5886..256c328567a 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -946,7 +946,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
     exit 1
   fi
 
-  run_tool healthcheck -zkHost "$ZK_HOST" -collection "$HEALTHCHECK_COLLECTION" $VERBOSE
+  run_tool healthcheck -zkHost "$ZK_HOST" -c "$HEALTHCHECK_COLLECTION" $VERBOSE
 
   exit $?
 fi
diff --git a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
index 94cc006ff8d..28c9eaa6c49 100644
--- a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
@@ -28,12 +28,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.cloud.ClusterState;
@@ -170,7 +172,15 @@ protected void runCloudTool(CloudSolrClient cloudSolrClient, CommandLine cli) th
           q = new SolrQuery("*:*");
           q.setRows(0);
           q.set(DISTRIB, "false");
-          try (var solrClientForCollection = SolrCLI.getSolrClient(coreUrl)) {
+
+          // SolrCLI.getSolrClient converts the coreUrl back into a root Solr url, but we need to
+          // talk to specific core so manually creating the client.
+          // try (var solrClientForCollection = SolrCLI.getSolrClient(coreUrl)) {
+          try (var solrClientForCollection =
+              new Http2SolrClient.Builder(coreUrl)
+                  .withMaxConnectionsPerHost(32)
+                  .withKeyStoreReloadInterval(-1, TimeUnit.SECONDS)
+                  .build()) {
             qr = solrClientForCollection.query(q);
             numDocs = qr.getResults().getNumFound();
             try (var solrClient = SolrCLI.getSolrClient(replicaCoreProps.getBaseUrl())) {
diff --git a/solr/packaging/test/test_healthcheck.bats b/solr/packaging/test/test_healthcheck.bats
index 9a0768b284e..61700f45a97 100644
--- a/solr/packaging/test/test_healthcheck.bats
+++ b/solr/packaging/test/test_healthcheck.bats
@@ -30,7 +30,8 @@ teardown() {
 
 @test "healthcheck on cloud solr" {
   solr start -c -e films
-  run solr healthcheck -c films
+  run solr healthcheck -c films -V
   refute_output --partial 'error'
+  assert_output --partial '"collection":"films"'
   
 }

From 777aefd7d68d6d2f9cce2958e38d99412ebe6565 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 14:00:00 -0400
Subject: [PATCH 04/16] whitespace

---
 solr/packaging/test/test_create.bats | 2 --
 1 file changed, 2 deletions(-)

diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.bats
index 0eb6df86c69..c2e52ad27c3 100644
--- a/solr/packaging/test/test_create.bats
+++ b/solr/packaging/test/test_create.bats
@@ -53,7 +53,6 @@ teardown() {
   
   run solr create -c COLL_NAME -p ${SOLR2_PORT}
   assert_output --partial "Created new core 'COLL_NAME'"
-  
 }
 
 @test "ensure -V verbose parameter is supported" {
@@ -62,5 +61,4 @@ teardown() {
   
   run solr create -c COLL_NAME -V
   assert_output --partial "Created new core 'COLL_NAME'"
-  
 }

From 872d79e32fcbacc5f649396701490e2afc4d2ab3 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 14:18:22 -0400
Subject: [PATCH 05/16] restor the -p and -port to bin/solr delete

---
 .../java/org/apache/solr/cli/DeleteTool.java  | 42 +++++++++++++++----
 .../test/test_delete_collection.bats          | 12 ++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
index d5bf4234858..32e6f6d7c16 100644
--- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
@@ -22,6 +22,7 @@
 import java.io.PrintStream;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -40,6 +41,7 @@
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.EnvUtils;
 import org.apache.solr.common.util.NamedList;
 import org.noggit.CharArr;
 import org.noggit.JSONWriter;
@@ -122,16 +124,36 @@ public List<Option> getOptions() {
             .desc(
                 "Skip safety checks when deleting the configuration directory used by a collection.")
             .build(),
+        Option.builder("p")
+            .longOpt("port")
+            .deprecated(
+                DeprecatedAttributes.builder()
+                    .setForRemoval(true)
+                    .setSince("9.7")
+                    .setDescription("Use --solr-url instead")
+                    .get())
+            .argName("PORT")
+            .hasArg()
+            .required(false)
+            .desc("Port of a local Solr instance where you want to create the new core.")
+            .build(),
         SolrCLI.OPTION_SOLRURL,
         SolrCLI.OPTION_SOLRURL_DEPRECATED,
         SolrCLI.OPTION_ZKHOST,
-        SolrCLI.OPTION_ZKHOST_DEPRECATED);
+        SolrCLI.OPTION_ZKHOST_DEPRECATED,
+        SolrCLI.OPTION_VERBOSE_DEPRECATED);
   }
 
   @Override
   public void runImpl(CommandLine cli) throws Exception {
     SolrCLI.raiseLogLevelUnlessVerbose(cli);
 
+    // If a port is provided, inject it into the environment variables so
+    // that {@link SolrCLI#getDefaultSolrUrl()} can use it instead of the default 8983.
+    if (cli.hasOption("p")) {
+      EnvUtils.setProperty("jetty.port", cli.getOptionValue("p"));
+    }
+
     try (var solrClient = SolrCLI.getSolrClient(cli)) {
       Map<String, Object> systemInfo =
           solrClient
@@ -248,21 +270,22 @@ protected void deleteCollection(CloudSolrClient cloudSolrClient, CommandLine cli
       }
     }
 
-    if (response != null) {
-      // pretty-print the response to stdout
-      CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
-      echo(arr.toString());
-      echo("\n");
+    if (isVerbose()) {
+      if (response != null) {
+        // pretty-print the response to stdout
+        CharArr arr = new CharArr();
+        new JSONWriter(arr, 2).write(response.asMap());
+        echo(arr.toString());
+      }
     }
 
-    echo("Deleted collection '" + collectionName + "' using CollectionAdminRequest");
+    echo(String.format(Locale.ROOT, "\nDeleted collection '%s'", collectionName));
   }
 
   protected void deleteCore(CommandLine cli, SolrClient solrClient) throws Exception {
     String coreName = cli.getOptionValue(NAME);
 
-    echo("\nDeleting core '" + coreName + "' using CoreAdminRequest\n");
+    echoIfVerbose("\nDeleting core '" + coreName + "'", cli);
 
     NamedList<Object> response;
     try {
@@ -281,5 +304,6 @@ protected void deleteCore(CommandLine cli, SolrClient solrClient) throws Excepti
       echoIfVerbose((String) response.get("response"), cli);
       echoIfVerbose("\n", cli);
     }
+    echo(String.format(Locale.ROOT, "\nDeleted core '%s'", coreName));
   }
 }
diff --git a/solr/packaging/test/test_delete_collection.bats b/solr/packaging/test/test_delete_collection.bats
index 6fec21283e6..5f12d22e90b 100644
--- a/solr/packaging/test/test_delete_collection.bats
+++ b/solr/packaging/test/test_delete_collection.bats
@@ -77,3 +77,15 @@ teardown() {
   solr delete -c "COLL_NAME" --delete-config false
   assert config_exists "COLL_NAME"
 }
+
+@test "ensure -p port parameter is supported" {
+
+  #solr start -c -p ${SOLR2_PORT}
+  #solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000
+  
+  run solr create -c COLL_NAME -p ${SOLR_PORT}
+  assert_output --partial "Created collection 'COLL_NAME'"
+  
+  run solr delete -c COLL_NAME --delete-config false -p ${SOLR_PORT} -V
+  assert_output --partial "Deleted collection 'COLL_NAME'"
+}

From 49ffeb4e66ba23f101ffcb5b1977d21cddea6ec8 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 14:18:32 -0400
Subject: [PATCH 06/16] nicer messaging

---
 .../java/org/apache/solr/cli/CreateTool.java  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index e169d26ce47..1f67bb02b83 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -370,25 +370,25 @@ protected void createCollection(CloudSolrClient cloudSolrClient, CommandLine cli
           "Failed to create collection '" + collectionName + "' due to: " + sse.getMessage());
     }
 
-    if (cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt())) {
+    if (isVerbose()) {
       // pretty-print the response to stdout
       CharArr arr = new CharArr();
       new JSONWriter(arr, 2).write(response.asMap());
       echo(arr.toString());
-    } else {
-      String endMessage =
-          String.format(
-              Locale.ROOT,
-              "Created collection '%s' with %d shard(s), %d replica(s)",
-              collectionName,
-              numShards,
-              replicationFactor);
-      if (confName != null && !confName.trim().isEmpty()) {
-        endMessage += String.format(Locale.ROOT, " with config-set '%s'", confName);
-      }
+    }
 
-      echo(endMessage);
+    String endMessage =
+        String.format(
+            Locale.ROOT,
+            "Created collection '%s' with %d shard(s), %d replica(s)",
+            collectionName,
+            numShards,
+            replicationFactor);
+    if (confName != null && !confName.trim().isEmpty()) {
+      endMessage += String.format(Locale.ROOT, " with config-set '%s'", confName);
     }
+
+    echo(endMessage);
   }
 
   private Path getFullConfDir(Path solrInstallDir, Path confDirName) {

From bf4c4954ed81c445b84b29fb85384822cb850e39 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 14:18:46 -0400
Subject: [PATCH 07/16] make sure -V for verbose still works.

---
 solr/packaging/test/test_zk.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/packaging/test/test_zk.bats b/solr/packaging/test/test_zk.bats
index be7e2c25d1d..cccddeabf5c 100644
--- a/solr/packaging/test/test_zk.bats
+++ b/solr/packaging/test/test_zk.bats
@@ -89,7 +89,7 @@ teardown() {
   touch myfile2.txt
   run solr zk cp myfile2.txt zk:myfile2.txt -z localhost:${ZK_PORT}
   sleep 1
-  run solr zk ls / -z localhost:${ZK_PORT}
+  run solr zk ls / -z localhost:${ZK_PORT} -V
   assert_output --partial "myfile2.txt"
 
   touch myfile3.txt

From 3ae097d82bfdcdde44393616bdaa6f54354210fd Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 14:52:06 -0400
Subject: [PATCH 08/16] we don't force a check for -z or --solr-url, but you do
 need one or the other or we default to localhost.

---
 solr/packaging/test/test_healthcheck.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/packaging/test/test_healthcheck.bats b/solr/packaging/test/test_healthcheck.bats
index 61700f45a97..499e7af31e3 100644
--- a/solr/packaging/test/test_healthcheck.bats
+++ b/solr/packaging/test/test_healthcheck.bats
@@ -30,7 +30,7 @@ teardown() {
 
 @test "healthcheck on cloud solr" {
   solr start -c -e films
-  run solr healthcheck -c films -V
+  run solr healthcheck -c films -z localhost:${ZK_PORT} -V
   refute_output --partial 'error'
   assert_output --partial '"collection":"films"'
   

From b1bb0abfe800090876ad1384760021a1e5d0906b Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 13 Sep 2024 16:08:44 -0400
Subject: [PATCH 09/16] maybe have the magic incantation?

---
 solr/bin/solr                                               | 2 +-
 solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java | 2 +-
 solr/packaging/test/test_healthcheck.bats                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index 256c328567a..04e91a413e0 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -946,7 +946,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
     exit 1
   fi
 
-  run_tool healthcheck -zkHost "$ZK_HOST" -c "$HEALTHCHECK_COLLECTION" $VERBOSE
+  run_tool healthcheck -z "$ZK_HOST" -c "$HEALTHCHECK_COLLECTION" $VERBOSE
 
   exit $?
 fi
diff --git a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
index 28c9eaa6c49..62ad942cbf5 100644
--- a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
@@ -94,8 +94,8 @@ public void runImpl(CommandLine cli) throws Exception {
       CLIO.err("Healthcheck tool only works in Solr Cloud mode.");
       System.exit(1);
     }
+    echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
     try (CloudHttp2SolrClient cloudSolrClient = SolrCLI.getCloudHttp2SolrClient(zkHost)) {
-      echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
       cloudSolrClient.connect();
       runCloudTool(cloudSolrClient, cli);
     }
diff --git a/solr/packaging/test/test_healthcheck.bats b/solr/packaging/test/test_healthcheck.bats
index 499e7af31e3..0aa6db6fb1f 100644
--- a/solr/packaging/test/test_healthcheck.bats
+++ b/solr/packaging/test/test_healthcheck.bats
@@ -29,8 +29,8 @@ teardown() {
 }
 
 @test "healthcheck on cloud solr" {
-  solr start -c -e films
-  run solr healthcheck -c films -z localhost:${ZK_PORT} -V
+  solr start -c -e films -p ${SOLR_PORT}
+  run solr healthcheck -c films -zkhost localhost:${ZK_PORT} -V
   refute_output --partial 'error'
   assert_output --partial '"collection":"films"'
   

From 7a5a51f560640d29cc5f35d96fb3c185a158a81e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Wed, 18 Sep 2024 11:16:41 -0400
Subject: [PATCH 10/16] remove dead code

---
 solr/packaging/test/test_delete_collection.bats | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/solr/packaging/test/test_delete_collection.bats b/solr/packaging/test/test_delete_collection.bats
index 5f12d22e90b..68be61ce9eb 100644
--- a/solr/packaging/test/test_delete_collection.bats
+++ b/solr/packaging/test/test_delete_collection.bats
@@ -78,11 +78,7 @@ teardown() {
   assert config_exists "COLL_NAME"
 }
 
-@test "ensure -p port parameter is supported" {
-
-  #solr start -c -p ${SOLR2_PORT}
-  #solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000
-  
+@test "ensure -p port parameter is supported" {  
   run solr create -c COLL_NAME -p ${SOLR_PORT}
   assert_output --partial "Created collection 'COLL_NAME'"
   

From 74f66d8308bb5b7ddf9cccb36837b6cc02b1e4d1 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Wed, 18 Sep 2024 12:25:40 -0400
Subject: [PATCH 11/16] Use the params that exist in 9.7

---
 solr/bin/solr.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 4c916c78eb5..6038c98ee53 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1548,7 +1548,7 @@ echo ZK_HOST: !ZK_HOST!
 "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
-  org.apache.solr.cli.SolrCLI healthcheck -collection !HEALTHCHECK_COLLECTION! -zkHost !ZK_HOST! %HEALTHCHECK_VERBOSE%
+  org.apache.solr.cli.SolrCLI healthcheck -c !HEALTHCHECK_COLLECTION! -z !ZK_HOST! %HEALTHCHECK_VERBOSE%
 goto done
 
 :run_solrcli

From 394a7b18059fafcbd6272815c75f573bc9cde556 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Wed, 18 Sep 2024 12:26:15 -0400
Subject: [PATCH 12/16] Provide some docs why you wouldn't want to use this
 method with a core.

I didn't try to have it be smart, like "Oh, you are using it with a core and throw an error"
---
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 673b56d2900..1cc811e71a0 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -531,6 +531,10 @@ public static boolean exceptionIsAuthRelated(Exception exc) {
    * <p>Note that from Solr 10.0 Solr will use / as base URL to support /api and other contexts, so
    * handling of hostContext differs between Solr 9.x and 10.x.
    *
+   * <p>Note that this should not be used with individual core specific urls such as
+   * "http://127.0.0.1:51428/solr/bob_shard1_replica_n1/" as it removes the core name by converting
+   * the url to "http://127.0.0.1:51428/" before creating the client, which gives you the wrong SolrCLient.
+   *
    * @param solrUrl the base URL of Solr
    * @return a SolrClient initialized with correct hostContext, default '/solr'
    */

From ad7ebb8f849c7892081b96caab9033566608004c Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Wed, 18 Sep 2024 12:26:42 -0400
Subject: [PATCH 13/16] No need for return.

---
 solr/core/src/java/org/apache/solr/cli/ToolBase.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/ToolBase.java b/solr/core/src/java/org/apache/solr/cli/ToolBase.java
index 4a87acc104e..a668ed22b5e 100644
--- a/solr/core/src/java/org/apache/solr/cli/ToolBase.java
+++ b/solr/core/src/java/org/apache/solr/cli/ToolBase.java
@@ -39,11 +39,7 @@ protected void echoIfVerbose(final String msg, CommandLine cli) {
     }
   }
 
-  /**
-   * Is this tool being run in a verbose mode?
-   *
-   * @return verbose or not
-   */
+  /** Is this tool being run in a verbose mode? */
   protected boolean isVerbose() {
     return verbose;
   }

From e8ee34b239759fc6f4afdcb50ba704092690411b Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Wed, 18 Sep 2024 13:12:01 -0400
Subject: [PATCH 14/16] Nicer messaging

---
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 1cc811e71a0..91e66d409eb 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -533,7 +533,7 @@ public static boolean exceptionIsAuthRelated(Exception exc) {
    *
    * <p>Note that this should not be used with individual core specific urls such as
    * "http://127.0.0.1:51428/solr/bob_shard1_replica_n1/" as it removes the core name by converting
-   * the url to "http://127.0.0.1:51428/" before creating the client, which gives you the wrong SolrCLient.
+   * the url to "http://127.0.0.1:51428/" before creating the client.
    *
    * @param solrUrl the base URL of Solr
    * @return a SolrClient initialized with correct hostContext, default '/solr'

From edbff4bc5e00a90642b4015155dc719c7f9d069e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 24 Sep 2024 05:37:26 -0700
Subject: [PATCH 15/16] improve test to check verbose mode

---
 solr/packaging/test/test_create.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.bats
index c2e52ad27c3..51b70884386 100644
--- a/solr/packaging/test/test_create.bats
+++ b/solr/packaging/test/test_create.bats
@@ -59,6 +59,6 @@ teardown() {
   solr start 
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
   
-  run solr create -c COLL_NAME -V
-  assert_output --partial "Created new core 'COLL_NAME'"
+  run solr create -c COLL_NAME -v
+  assert_output --partial "Creating new core 'COLL_NAME' using CoreAdminRequest"
 }

From f90ce333df9dbe8f2228d580b33f3007184bc36d Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sat, 28 Sep 2024 15:06:14 -0400
Subject: [PATCH 16/16] Update solr/packaging/test/test_create.bats

Co-authored-by: Christos Malliaridis <c.malliaridis@gmail.com>
---
 solr/packaging/test/test_create.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.bats
index 51b70884386..2fed6fb6a73 100644
--- a/solr/packaging/test/test_create.bats
+++ b/solr/packaging/test/test_create.bats
@@ -59,6 +59,6 @@ teardown() {
   solr start 
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
   
-  run solr create -c COLL_NAME -v
+  run solr create -c COLL_NAME -V
   assert_output --partial "Creating new core 'COLL_NAME' using CoreAdminRequest"
 }