bin/solr in branch_9_7 has commands that fail #2710
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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; | ||
|
|
@@ -92,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)) { | ||
| cloudSolrClient.connect(); | ||
| runCloudTool(cloudSolrClient, cli); | ||
| } | ||
|
|
@@ -170,7 +172,15 @@ protected void runCloudTool(CloudSolrClient cloudSolrClient, CommandLine cli) th | |
| q = new SolrQuery("*:*"); | ||
| q.setRows(0); | ||
| q.set(DISTRIB, "false"); | ||
|
|
||
| // SolrCLI.getSolrClient converts the coreUrl back into a root Solr url, but we need to | ||
| // talk to specific core so manually creating the client. | ||
|
There was a problem hiding this comment. Hmm, would you say this is a bug, or is it well documented in the javadoc? There was a problem hiding this comment. Humm..... I read it and it says: I think this is the only place we need a core specific url... Do you think it should support that use case as well? There was a problem hiding this comment. I looked a bit more at the code, and decided to go with the javadoc approach! |
||
| // 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())) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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()) | ||
| || cli.hasOption(OPTION_VERBOSE_DEPRECATED.getOpt()))) { | ||
| StartupLoggingUtils.changeLogLevel("WARN"); | ||
| } | ||
| } | ||
|
|
@@ -519,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. | ||
| * | ||
| * @param solrUrl the base URL of Solr | ||
| * @return a SolrClient initialized with correct hostContext, default '/solr' | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,18 +34,25 @@ protected ToolBase(PrintStream stdout) { | |
| } | ||
|
|
||
| protected void echoIfVerbose(final String msg, CommandLine cli) { | ||
| if (verbose) { | ||
| echo(msg); | ||
| } | ||
| } | ||
|
|
||
| /** Is this tool being run in a verbose mode? */ | ||
| 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()) | ||
| || cli.hasOption(SolrCLI.OPTION_VERBOSE_DEPRECATED); | ||
|
|
||
| int toolExitStatus = 0; | ||
| try { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,8 +34,31 @@ 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 -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 | ||
|
|
||
| run solr create -c COLL_NAME -p ${SOLR2_PORT} | ||
| 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'" | ||
|
There was a problem hiding this comment. Should not this assert a string that is only printed in verbose mode? There was a problem hiding this comment. Good question... I think for core, you got this message, and for collection, you got a different dump (that was more like the api response). I changed it so that both core and collection output a short message like this, and then if you add the There was a problem hiding this comment. Sure, I just expected the assert to fail without the There was a problem hiding this comment. I finally understand what you mean, and am looking at it and then will merge. |
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,3 +77,11 @@ teardown() { | |
| solr delete -c "COLL_NAME" --delete-config false | ||
| assert config_exists "COLL_NAME" | ||
| } | ||
|
|
||
| @test "ensure -p port parameter is supported" { | ||
| 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'" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,8 +29,9 @@ teardown() { | |
| } | ||
|
|
||
| @test "healthcheck on cloud solr" { | ||
| solr start -c -e films -p ${SOLR_PORT} | ||
| run solr healthcheck -c films -zkhost localhost:${ZK_PORT} -V | ||
| refute_output --partial 'error' | ||
janhoy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| assert_output --partial '"collection":"films"' | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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} -V | ||
| assert_output --partial "myfile2.txt" | ||
|
|
||
| touch myfile3.txt | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be eventually