Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824218403
##
solr/core/src/java/org/apache/solr/cli/ApiTool.java:
##
@@ -57,37 +56,19 @@ public List getOptions() {
.longOpt("solr-url")
.argName("URL")
.hasArg()
-.required(false) // swap back to required when we eliminate
deprecated option
-.desc("Send a GET request to a Solr API endpoint.")
-.build(),
-Option.builder("get")
-.longOpt("get")
-.deprecated(
-DeprecatedAttributes.builder()
-.setForRemoval(true)
-.setSince("9.7")
-.setDescription("Use --solr-url instead")
-.get())
-.argName("URL")
-.hasArg()
-.required(false)
+.required(true)
.desc("Send a GET request to a Solr API endpoint.")
.build(),
SolrCLI.OPTION_CREDENTIALS);
}
@Override
public void runImpl(CommandLine cli) throws Exception {
-String response = null;
-String getUrl =
-cli.hasOption("solr-url") ? cli.getOptionValue("solr-url") :
cli.getOptionValue("get");
-if (getUrl != null) {
- response = callGet(getUrl,
cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt()));
-}
-if (response != null) {
- // pretty-print the response to stdout
- echo(response);
-}
+String getUrl = cli.getOptionValue("solr-url");
+String response = callGet(getUrl,
cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt()));
+
+// pretty-print the response to stdout
+echo(response);
Review Comment:
i don't think it can ever be mull... it would be an error message etc.
If there is an scenario where it *coud* be null, we should add a unit test!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17525: Text Embedder Query Parser [solr]
alessandrobenedetti commented on code in PR #2809: URL: https://github.com/apache/solr/pull/2809#discussion_r1823899972 ## solr/modules/llm/src/test-files/solr/collection1/conf/stopwords.txt: ## Review Comment: not at all, I'll remove it with the next commit! ## solr/modules/llm/src/test-files/solr/collection1/conf/synonyms.txt: ## Review Comment: not at all, I'll remove it with the next commit! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
malliaridis commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824945975
##
solr/core/src/java/org/apache/solr/cli/SolrCLI.java:
##
@@ -215,18 +150,16 @@ public static void exit(int exitStatus) {
public static void main(String[] args) throws Exception {
final boolean hasNoCommand =
args == null || args.length == 0 || args[0] == null ||
args[0].trim().length() == 0;
-final boolean isHelpCommand =
-!hasNoCommand && Arrays.asList("-h", "--help", "/?").contains(args[0]);
+final boolean isHelpCommand = !hasNoCommand && Arrays.asList("-h",
"--help").contains(args[0]);
if (hasNoCommand || isHelpCommand) {
printHelp();
exit(1);
}
-if (Arrays.asList("-version", "version").contains(args[0])) {
- // select the version tool to be run
- CLIO.out("Deprecated operation as of 9.8. Please use bin/solr
--version.");
- args = new String[] {"version"};
+if (args[0].equalsIgnoreCase("version")) {
+ CLIO.out("version is not a valid command! Did you mean --version?\n");
+ exit(1);
Review Comment:
> I think at that point, I might suggest we introduce a bin/solr inspect
command.. that could be then used to do lots of interesting things...
I like this idea, especially if it comes to multiple Solr clusters /
instances, this would probably be helpful. But I think this is more of a
command we may introduce in the future.
If I remember correct, we also discussed the command `solr version` and
decided to drop support, rather than implement functionality under this command
for supporting urls as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Created] (SOLR-17537) Let Curator handle state compression in ZooKeeper
Houston Putman created SOLR-17537:
-
Summary: Let Curator handle state compression in ZooKeeper
Key: SOLR-17537
URL: https://issues.apache.org/jira/browse/SOLR-17537
Project: Solr
Issue Type: Sub-task
Security Level: Public (Default Security Level. Issues are Public)
Reporter: Houston Putman
Curator has an interface {{{}CompressionProvider{}}}, that can be provided when
building a {{CuratorFramework}} client. We can create a CompressionProvider
that wraps our custom compression logic, so that Curator will handle it for us.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Resolved] (SOLR-17364) Vulnerabilities in Solr 8.11.3
[ https://issues.apache.org/jira/browse/SOLR-17364?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jason Gerlowski resolved SOLR-17364. Resolution: Information Provided > Vulnerabilities in Solr 8.11.3 > -- > > Key: SOLR-17364 > URL: https://issues.apache.org/jira/browse/SOLR-17364 > Project: Solr > Issue Type: Task > Components: SolrCloud >Affects Versions: 8.11.3 >Reporter: Parag Ninawe >Priority: Major > > Our Vulnerability scans show new vulnerabilities in Solr 8.11.3 > |CVE-2022-3171|protobuf-java-3.15.0.jar|HIGH| > |CVE-2024-21634|ion-java-1.0.2.jar|HIGH| > |CVE-2023-2976|junit4-ant-2.8.1.jar|HIGH| > |CVE-2018-19362|htrace-core4-4.1.0-incubating.jar|CRITICAL| > > -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Created] (SOLR-17536) Migrate SolrZkClient customizations to be Curator plugins
Houston Putman created SOLR-17536: - Summary: Migrate SolrZkClient customizations to be Curator plugins Key: SOLR-17536 URL: https://issues.apache.org/jira/browse/SOLR-17536 Project: Solr Issue Type: Improvement Security Level: Public (Default Security Level. Issues are Public) Reporter: Houston Putman Curator recipes all take in a CuratorFramework client as an input when creating the recipes. This means that they will not work with the customizations we have added in SolrZkClient. In order for the recipes to work the way that the rest of Solr interacts with Zookeeper, we should try moving all customized logic from SolrZkClient into plugins for the CuratorFramework client. -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Created] (SOLR-17538) CloudHttp2SolrClient needs a custom ClusterStateProvider option
David Smiley created SOLR-17538: --- Summary: CloudHttp2SolrClient needs a custom ClusterStateProvider option Key: SOLR-17538 URL: https://issues.apache.org/jira/browse/SOLR-17538 Project: Solr Issue Type: Improvement Security Level: Public (Default Security Level. Issues are Public) Components: SolrJ Reporter: David Smiley Assignee: Sanjay Dutt It's currently _impossible_ to create a CloudHttp2SolrClient with a custom ClusterStateProvider, e.g. a ZkClientClusterStateProvider with an existing ZkStateReader. This issue aims to address that somehow. CloudLegacySolrClient _does_ have this ability! It must be addressed (and used in ZkController) to prevent a possible performance regression [here|https://github.com/apache/solr/pull/2751], which switched from a CloudLegacySolrClient to CloudHttp2SolrClient but without using the existing ZkStateReader and possibly a chroot bug (?). -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824234733
##
solr/core/src/java/org/apache/solr/cli/ApiTool.java:
##
@@ -57,37 +56,19 @@ public List getOptions() {
.longOpt("solr-url")
.argName("URL")
.hasArg()
-.required(false) // swap back to required when we eliminate
deprecated option
-.desc("Send a GET request to a Solr API endpoint.")
-.build(),
-Option.builder("get")
-.longOpt("get")
-.deprecated(
-DeprecatedAttributes.builder()
-.setForRemoval(true)
-.setSince("9.7")
-.setDescription("Use --solr-url instead")
-.get())
-.argName("URL")
-.hasArg()
-.required(false)
+.required(true)
.desc("Send a GET request to a Solr API endpoint.")
.build(),
SolrCLI.OPTION_CREDENTIALS);
}
@Override
public void runImpl(CommandLine cli) throws Exception {
-String response = null;
-String getUrl =
-cli.hasOption("solr-url") ? cli.getOptionValue("solr-url") :
cli.getOptionValue("get");
-if (getUrl != null) {
- response = callGet(getUrl,
cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt()));
-}
-if (response != null) {
- // pretty-print the response to stdout
- echo(response);
-}
+String getUrl = cli.getOptionValue("solr-url");
Review Comment:
I flipped the "required" back to true, so it can't be null!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824808865
##
solr/core/src/java/org/apache/solr/cli/SolrCLI.java:
##
@@ -215,18 +150,16 @@ public static void exit(int exitStatus) {
public static void main(String[] args) throws Exception {
final boolean hasNoCommand =
args == null || args.length == 0 || args[0] == null ||
args[0].trim().length() == 0;
-final boolean isHelpCommand =
-!hasNoCommand && Arrays.asList("-h", "--help", "/?").contains(args[0]);
+final boolean isHelpCommand = !hasNoCommand && Arrays.asList("-h",
"--help").contains(args[0]);
if (hasNoCommand || isHelpCommand) {
printHelp();
exit(1);
}
-if (Arrays.asList("-version", "version").contains(args[0])) {
- // select the version tool to be run
- CLIO.out("Deprecated operation as of 9.8. Please use bin/solr
--version.");
- args = new String[] {"version"};
+if (args[0].equalsIgnoreCase("version")) {
+ CLIO.out("version is not a valid command! Did you mean --version?\n");
+ exit(1);
Review Comment:
I think at that point, I might suggest we introduce a `bin/solr inspect`
command.. that could be then used to do lots of interesting things...
so we don't end up with `bin/solr --version` and `bin/solr version -s
http://mycorp.dev.solr:234525` ;-)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Updated] (SOLR-17535) Remove ClusterState.getCollectionStates() and getCollectionsMap()
[
https://issues.apache.org/jira/browse/SOLR-17535?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
David Smiley updated SOLR-17535:
Description: To avoid creating intermediary maps for ClusterState
consumers, and to limit the direct usages of CollectionRef, I propose removing
both getCollectionStates and getCollectionsMap. This also unblocks future
changes to work in a more scalable manner. Instead, callers can use
forEachCollection or a new {{Stream}} one proposed here. (was:
To avoid creating intermediary maps for ClusterState consumers, I propose
removing both getCollectionStates and getCollectionsMap. This also unblocks
future changes to work in a more scalable manner. Instead, callers can use
forEachCollection or a new \{{Stream}} one proposed here.)
> Remove ClusterState.getCollectionStates() and getCollectionsMap()
> -
>
> Key: SOLR-17535
> URL: https://issues.apache.org/jira/browse/SOLR-17535
> Project: Solr
> Issue Type: Improvement
> Security Level: Public(Default Security Level. Issues are Public)
> Components: SolrCloud
>Reporter: David Smiley
>Assignee: David Smiley
>Priority: Major
>
> To avoid creating intermediary maps for ClusterState consumers, and to limit
> the direct usages of CollectionRef, I propose removing both
> getCollectionStates and getCollectionsMap. This also unblocks future changes
> to work in a more scalable manner. Instead, callers can use
> forEachCollection or a new {{Stream}} one proposed here.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[PR] Update references to ASF Jenkins jobs [solr]
gerlowskija opened a new pull request, #2827: URL: https://github.com/apache/solr/pull/2827 # Description We've recently tweaked the Jenkins jobs that we run, in order to get as many 'test' runs as possible out of our hardware. This involved changing some job names and details in Jenkins. Links and references to those jobs in our dev-docs and README files need updated accordingly. # Checklist Please review the following and check all that apply: - [x] I have reviewed the guidelines for [How to Contribute](https://github.com/apache/solr/blob/main/CONTRIBUTING.md) and my code conforms to the standards described there to the best of my ability. - [x] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended, not available for branches on forks living under an organisation) - [x] I have developed this patch against the `main` branch. - [x] I have run `./gradlew check`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17516: LBHttpSolrClient: support HttpJdkSolrClient (multiple class verson) [solr]
jdyer1 commented on PR #2805: URL: https://github.com/apache/solr/pull/2805#issuecomment-2450126360 I opened a better PR #2828 with a generic client. Please review/compare. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820:
URL: https://github.com/apache/solr/pull/2820#issuecomment-2450147305
> @janhoy in commit
[2f3c0ef](https://github.com/apache/solr/commit/2f3c0ef959b6a1f921217ef30da5347ec17a5b5f)
I removed the passing of the `-j` (Jetty options) into the RunExampleTool
because it was an option that was ignored. You added the line in the bin/solr
so wanted to flag this to you in case you think we need to someone add this
capability to RunExampleTool!
@janhoy never mind, turns out regardless of running Solr in foreground or
not, we pass in the settings via `start_solr "$FG" "${ADDITIONAL_CMD_OPTS:-}"
"${ADDITIONAL_JETTY_CONFIG:-}"`. So the removed line was never actually used!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
dsmiley commented on code in PR #2811:
URL: https://github.com/apache/solr/pull/2811#discussion_r1824671510
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java:
##
@@ -610,7 +611,7 @@ private void checkAZombieServer(EndpointWrapper
zombieServer) {
final String effectiveCollection =
Objects.requireNonNullElse(zombieEndpoint.getCore(),
getDefaultCollection());
final var responseRaw =
- doMakeRequest(
+ doRequest(
getClient(zombieEndpoint),
zombieEndpoint.getBaseUrl(),
Review Comment:
you didn't want to pass simply the endpoint (the overload)? Same for the
other cases in this file.
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java:
##
@@ -480,14 +480,35 @@ private static boolean isTimeExceeded(long
timeAllowedNano, long timeOutTime) {
return timeAllowedNano > 0 && System.nanoTime() > timeOutTime;
}
+ private NamedList doMakeRequest(Endpoint endpoint, SolrRequest
solrRequest)
+ throws SolrServerException, IOException {
+final var solrClient = getClient(endpoint);
+return doMakeRequest(solrClient, endpoint.getBaseUrl(),
endpoint.getCore(), solrRequest);
+ }
+
+ // TODO This special casing can be removed if either: (1) SOLR-16367 is
completed, or (2)
+ // LBHttp2SolrClient.getClient() is modified to return a client already
pointed at the correct URL
+ private NamedList doMakeRequest(
+ SolrClient solrClient, String baseUrl, String collection, SolrRequest
solrRequest)
+ throws SolrServerException, IOException {
+// Some implementations of LBSolrClient.getClient(...) return a
Http2SolrClient that may not be
+// pointed at the desired URL (or any URL for that matter). We special
case that here to ensure
+// the appropriate URL is provided.
+if (solrClient instanceof Http2SolrClient) {
+ final var httpSolrClient = (Http2SolrClient) solrClient;
+ return httpSolrClient.requestWithBaseUrl(baseUrl, (c) ->
c.request(solrRequest, collection));
+}
+
+return solrClient.request(solrRequest, collection);
Review Comment:
Then maybe we should simply have LBSolrClient cache an HTTP based SolrClient
per baseURL. Such underlying clients can share the underlying HttpClient.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] Remove crave.yaml [solr]
iamsanjay merged PR #2821: URL: https://github.com/apache/solr/pull/2821 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824809265
##
solr/core/src/java/org/apache/solr/cli/SolrCLI.java:
##
@@ -215,18 +150,16 @@ public static void exit(int exitStatus) {
public static void main(String[] args) throws Exception {
final boolean hasNoCommand =
args == null || args.length == 0 || args[0] == null ||
args[0].trim().length() == 0;
-final boolean isHelpCommand =
-!hasNoCommand && Arrays.asList("-h", "--help", "/?").contains(args[0]);
+final boolean isHelpCommand = !hasNoCommand && Arrays.asList("-h",
"--help").contains(args[0]);
if (hasNoCommand || isHelpCommand) {
printHelp();
exit(1);
}
-if (Arrays.asList("-version", "version").contains(args[0])) {
- // select the version tool to be run
- CLIO.out("Deprecated operation as of 9.8. Please use bin/solr
--version.");
- args = new String[] {"version"};
+if (args[0].equalsIgnoreCase("version")) {
+ CLIO.out("version is not a valid command! Did you mean --version?\n");
+ exit(1);
Review Comment:
I went ahead and took your suggestion @malliaridis
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820: URL: https://github.com/apache/solr/pull/2820#issuecomment-2450344779 I **think** I am done and ready for more review. I clearly was NOT done when I thought I was the first time!!! I love that while we added 176 lines we remove 1092 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820: URL: https://github.com/apache/solr/pull/2820#issuecomment-2450346488 I also anticipate that post this merge and some of the other inflight PR's, that we will want to reach out and ask the community for another round of testing on LInux and windows ;-) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820: URL: https://github.com/apache/solr/pull/2820#issuecomment-2450138855 @janhoy in commit 2f3c0ef959b6a1f921217ef30da5347ec17a5b5f I removed the passing of the `-j` (Jetty options) into the RunExampleTool because it was an option that was ignored. You added the line in the bin/solr so wanted to flag this to you in case you think we need to someone add this capability to RunExampleTool! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
gerlowskija commented on code in PR #2811:
URL: https://github.com/apache/solr/pull/2811#discussion_r1824622966
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java:
##
@@ -480,14 +480,35 @@ private static boolean isTimeExceeded(long
timeAllowedNano, long timeOutTime) {
return timeAllowedNano > 0 && System.nanoTime() > timeOutTime;
}
+ private NamedList doMakeRequest(Endpoint endpoint, SolrRequest
solrRequest)
+ throws SolrServerException, IOException {
+final var solrClient = getClient(endpoint);
+return doMakeRequest(solrClient, endpoint.getBaseUrl(),
endpoint.getCore(), solrRequest);
+ }
+
+ // TODO This special casing can be removed if either: (1) SOLR-16367 is
completed, or (2)
+ // LBHttp2SolrClient.getClient() is modified to return a client already
pointed at the correct URL
+ private NamedList doMakeRequest(
Review Comment:
I ended up going with `doRequest` based on your "use overload" comments on
L613 and L721 below
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820: URL: https://github.com/apache/solr/pull/2820#issuecomment-2449846136 I am leaving `SolrCLI#getOptionWithDeprecatedAndDefault` but adding some docs about what it's for, since I suspect we will have another deprecation soon! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] Actually make collections PRS enabled in tests [solr]
HoustonPutman commented on PR #2824: URL: https://github.com/apache/solr/pull/2824#issuecomment-2450294605 It is not advertised at all, I believe it is just used for testing. But I think default in the name is fine. `Solr.cloud.prs=true`, doesn't really tell me what I'm setting to true. Maybe enabled, but that sounds like you are allowing/disallowing something. Maybe we put "test" in the name so that it's clear this is just for testing? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-17448) Audit usage of ExecutorService#submit in Solr codebase
[ https://issues.apache.org/jira/browse/SOLR-17448?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894646#comment-17894646 ] ASF subversion and git services commented on SOLR-17448: Commit 9a9d922088c982508f17e537f5db7bf407a1b037 in solr's branch refs/heads/branch_9x from Sanjay Dutt [ https://gitbox.apache.org/repos/asf?p=solr.git;h=9a9d922088c ] SOLR-17448 SOLR-17497: IndexFetcher, catch exception instead of bubbling up uncaught (#2800) (cherry picked from commit cc30093c5ee988555389b50cf2333edf743bb50f) > Audit usage of ExecutorService#submit in Solr codebase > -- > > Key: SOLR-17448 > URL: https://issues.apache.org/jira/browse/SOLR-17448 > Project: Solr > Issue Type: Improvement >Affects Versions: 9.7 >Reporter: Andrey Bozhko >Priority: Minor > Labels: pull-request-available > Fix For: 9.8 > > Time Spent: 2.5h > Remaining Estimate: 0h > > There are quite a few places in Solr codebase where the background task is > created by invoking `ExecutorService#submit(...)` method - but where the > reference to the returned future is not retained. > So if the background task fails for any reason, and the task doesn't itself > have a try-catch block to log the failure, - the failure will go completely > unnoticed. > > This ticket is to review the usage of ExecutorService#submit method in the > codebase, and replace those with Executor#execute where appropriate. > > Originally brought up in the dev mailing list: > [https://lists.apache.org/thread/5f1965rltcspgw0j8nzcn2qnz9l4s8qm] -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-17497) Pull replicas throws AlreadyClosedException
[
https://issues.apache.org/jira/browse/SOLR-17497?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894647#comment-17894647
]
ASF subversion and git services commented on SOLR-17497:
Commit 9a9d922088c982508f17e537f5db7bf407a1b037 in solr's branch
refs/heads/branch_9x from Sanjay Dutt
[ https://gitbox.apache.org/repos/asf?p=solr.git;h=9a9d922088c ]
SOLR-17448 SOLR-17497: IndexFetcher, catch exception instead of bubbling up
uncaught (#2800)
(cherry picked from commit cc30093c5ee988555389b50cf2333edf743bb50f)
> Pull replicas throws AlreadyClosedException
> -
>
> Key: SOLR-17497
> URL: https://issues.apache.org/jira/browse/SOLR-17497
> Project: Solr
> Issue Type: Task
>Reporter: Sanjay Dutt
>Priority: Major
> Attachments: Screenshot 2024-10-23 at 6.01.02 PM.png
>
>
> Recently, a common exception (org.apache.lucene.store.AlreadyClosedException:
> this Directory is closed) seen in multiple failed test cases.
> FAILED: org.apache.solr.cloud.TestPullReplica.testKillPullReplica
> FAILED:
> org.apache.solr.cloud.SplitShardWithNodeRoleTest.testSolrClusterWithNodeRoleWithPull
> FAILED: org.apache.solr.cloud.TestPullReplica.testAddDocs
>
>
> {code:java}
> com.carrotsearch.randomizedtesting.UncaughtExceptionError: Captured an
> uncaught exception in thread: Thread[id=10271,
> name=fsyncService-6341-thread-1, state=RUNNABLE,
> group=TGRP-SplitShardWithNodeRoleTest]
> at
> __randomizedtesting.SeedInfo.seed([3F7DACB3BC44C3C4:E5DB3E97188A8EB9]:0)
> Caused by: org.apache.lucene.store.AlreadyClosedException: this Directory is
> closed
> at __randomizedtesting.SeedInfo.seed([3F7DACB3BC44C3C4]:0)
> at
> app//org.apache.lucene.store.BaseDirectory.ensureOpen(BaseDirectory.java:50)
> at
> app//org.apache.lucene.store.ByteBuffersDirectory.sync(ByteBuffersDirectory.java:237)
> at
> app//org.apache.lucene.tests.store.MockDirectoryWrapper.sync(MockDirectoryWrapper.java:214)
> at
> app//org.apache.solr.handler.IndexFetcher$DirectoryFile.sync(IndexFetcher.java:2034)
> at
> app//org.apache.solr.handler.IndexFetcher$FileFetcher.lambda$fetch$0(IndexFetcher.java:1803)
> at
> app//org.apache.solr.common.util.ExecutorUtil$MDCAwareThreadPoolExecutor.lambda$execute$1(ExecutorUtil.java:449)
> at
> java.base@11.0.24/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
> at
> java.base@11.0.24/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
> at java.base@11.0.24/java.lang.Thread.run(Thread.java:829)
> {code}
>
> Interesting thing about these test cases is that they all share same kind of
> setup where each has one shard and two replicas – one NRT and another is PULL.
>
> Going through one of the test case execution step.
> FAILED: org.apache.solr.cloud.TestPullReplica.testKillPullReplica
>
> Test flow
> 1. Create a collection with 1 NRT and 1 PULL replica
> 2. waitForState
> 3. waitForNumDocsInAllActiveReplicas(0); // *Name says it all*
> 4. Index another document.
> 5. waitForNumDocsInAllActiveReplicas(1);
> 6. Stop Pull replica
> 7. Index another document
> 8. waitForNumDocsInAllActiveReplicas(2);
> 9. Start Pull Replica
> 10. waitForState
> 11. waitForNumDocsInAllActiveReplicas(2);
>
> As per the logs the whole sequence executed successfully. Here is the link to
> the logs:
> [https://ge.apache.org/s/yxydiox3gvlf2/tests/task/:solr:core:test/details/org.apache.solr.cloud.TestPullReplica/testKillPullReplica/1/output]
> (link may stop working in the future)
>
> Last step where they are making sure that all the active replicas should have
> two documents each has logged a info which is another proof that it completed
> successfully.
>
> {code:java}
> 616575 INFO
> (TEST-TestPullReplica.testKillPullReplica-seed#[F30CC837FDD0DC28]) [n: c: s:
> r: x: t:] o.a.s.c.TestPullReplica Replica core_node3
> (https://127.0.0.1:35647/solr/pull_replica_test_kill_pull_replica_shard1_replica_n1/)
> has all 2 docs 616606 INFO (qtp1091538342-13057-null-11348)
> [n:127.0.0.1:38207_solr c:pull_replica_test_kill_pull_replica s:shard1
> r:core_node4 x:pull_replica_test_kill_pull_replica_shard1_replica_p2
> t:null-11348] o.a.s.c.S.Request webapp=/solr path=/select
> params={q=*:*&wt=javabin&version=2} rid=null-11348 hits=2 status=0 QTime=0
> 616607 INFO
> (TEST-TestPullReplica.testKillPullReplica-seed#[F30CC837FDD0DC28]) [n: c: s:
> r: x: t:] o.a.s.c.TestPullReplica Replica core_node4
> (https://127.0.0.1:38207/solr/pull_replica_test_kill_pull_replica_shard1_replica_p2/)
> has all 2 docs{code}
>
> *Where is the issue then?*
> In the logs it has been observed, that after restarting the PULL replica. The
> recovery process start
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
dsmiley commented on PR #2811: URL: https://github.com/apache/solr/pull/2811#issuecomment-2450153694 I know it's out of scope... sort of... but @iamsanjay recently updated SolrClientNodeStateProvider.invoke to not call setBasePath but the result is more lines of code / complexity than needed. There only needs to be one line of code inside the try-catch as follows: return cloudSolrClient.getHttpClient().requestWithBaseUrl(url, request::process); If you think this could reasonably be in this PR then please update (or tell me to add it accordingly). Or... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
gerlowskija commented on PR #2811: URL: https://github.com/apache/solr/pull/2811#issuecomment-2450109394 Alright - either adopted or responded to your comments @dsmiley . Take a look when you get a few! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
gerlowskija commented on code in PR #2811:
URL: https://github.com/apache/solr/pull/2811#discussion_r1824611991
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java:
##
@@ -480,14 +480,35 @@ private static boolean isTimeExceeded(long
timeAllowedNano, long timeOutTime) {
return timeAllowedNano > 0 && System.nanoTime() > timeOutTime;
}
+ private NamedList doMakeRequest(Endpoint endpoint, SolrRequest
solrRequest)
+ throws SolrServerException, IOException {
+final var solrClient = getClient(endpoint);
+return doMakeRequest(solrClient, endpoint.getBaseUrl(),
endpoint.getCore(), solrRequest);
+ }
+
+ // TODO This special casing can be removed if either: (1) SOLR-16367 is
completed, or (2)
+ // LBHttp2SolrClient.getClient() is modified to return a client already
pointed at the correct URL
+ private NamedList doMakeRequest(
+ SolrClient solrClient, String baseUrl, String collection, SolrRequest
solrRequest)
+ throws SolrServerException, IOException {
+// Some implementations of LBSolrClient.getClient(...) return a
Http2SolrClient that may not be
+// pointed at the desired URL (or any URL for that matter). We special
case that here to ensure
+// the appropriate URL is provided.
+if (solrClient instanceof Http2SolrClient) {
+ final var httpSolrClient = (Http2SolrClient) solrClient;
+ return httpSolrClient.requestWithBaseUrl(baseUrl, (c) ->
c.request(solrRequest, collection));
+}
+
+return solrClient.request(solrRequest, collection);
Review Comment:
> A comment directly above this line ...
Done
> Note there could be a JDK client specific issue as as @jdyer1 is presently
working on JDK client specific support.
Yeah, my first thought on seeing that PR was for the ramifications here.
Will take a look at his PR to make sure it plays nice with this code.
All of this logic would be much cleaner if all implementations of
`LBSolrClient.getClient(baseUrl)` returns a client that was "ready to go". The
apache impl returns a HttpSolrClient already pointed at the right URL, but the
Jetty impl doesn't.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[PR] SOLR-17516: LBHttpSolrClient: support HttpJdkSolrClient (Generic Version) [solr]
jdyer1 opened a new pull request, #2828: URL: https://github.com/apache/solr/pull/2828 Similar to #2805, this is a minimal PR to add Load Balancing functionality for `HttpJdkSolrClient`. Included is test refactoring, adding the *JdkClient as a random choice for the integration test. Whereas #2805 created a class hierarchy, this makes `LBHttp2SolrClient` generic. Adding a generic parameter to this class will not break backwards-compatibility. This seems a better option that #2805. One downside is we retain the name `LBHttp2SolrClient` although it is no longer strictly to be used with `Http2SolrClient`. However, the legacy implementation already uses the preferred name: `LBHttpSolrClient`. Whenever the legacy implementation is removed, I recommend also renaming `LBHttp2SolrClient` to `LBHttpSolrClient`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Assigned] (SOLR-16821) Make all boolean options not take a true/false but just the -option be enough.
[ https://issues.apache.org/jira/browse/SOLR-16821?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Eric Pugh reassigned SOLR-16821: Assignee: Eric Pugh > Make all boolean options not take a true/false but just the -option be enough. > -- > > Key: SOLR-16821 > URL: https://issues.apache.org/jira/browse/SOLR-16821 > Project: Solr > Issue Type: Sub-task > Components: cli >Affects Versions: 9.2.1 >Reporter: Eric Pugh >Assignee: Eric Pugh >Priority: Minor > > We have a mish mash of ways of passing in a boolean. I see "-commit" and > "-optimize", but I also see "-prompt true" and "-deleteConfig true". Let's > just make passing in the switch mean true wherever possible. -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-16821) Make all boolean options not take a true/false but just the -option be enough.
[ https://issues.apache.org/jira/browse/SOLR-16821?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894619#comment-17894619 ] Eric Pugh commented on SOLR-16821: -- Nope. Turns out we have some places. [~malliaridis] noticed that: AuthTool uses flags with Boolean arguments, should be deprecated and changed before 10 > Make all boolean options not take a true/false but just the -option be enough. > -- > > Key: SOLR-16821 > URL: https://issues.apache.org/jira/browse/SOLR-16821 > Project: Solr > Issue Type: Sub-task > Components: cli >Affects Versions: 9.2.1 >Reporter: Eric Pugh >Assignee: Eric Pugh >Priority: Minor > > We have a mish mash of ways of passing in a boolean. I see "-commit" and > "-optimize", but I also see "-prompt true" and "-deleteConfig true". Let's > just make passing in the switch mean true wherever possible. -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-17448) Audit usage of ExecutorService#submit in Solr codebase
[ https://issues.apache.org/jira/browse/SOLR-17448?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894640#comment-17894640 ] ASF subversion and git services commented on SOLR-17448: Commit cc30093c5ee988555389b50cf2333edf743bb50f in solr's branch refs/heads/main from Sanjay Dutt [ https://gitbox.apache.org/repos/asf?p=solr.git;h=cc30093c5ee ] SOLR-17448 SOLR-17497: IndexFetcher, catch exception instead of bubbling up uncaught (#2800) > Audit usage of ExecutorService#submit in Solr codebase > -- > > Key: SOLR-17448 > URL: https://issues.apache.org/jira/browse/SOLR-17448 > Project: Solr > Issue Type: Improvement >Affects Versions: 9.7 >Reporter: Andrey Bozhko >Priority: Minor > Labels: pull-request-available > Fix For: 9.8 > > Time Spent: 2.5h > Remaining Estimate: 0h > > There are quite a few places in Solr codebase where the background task is > created by invoking `ExecutorService#submit(...)` method - but where the > reference to the returned future is not retained. > So if the background task fails for any reason, and the task doesn't itself > have a try-catch block to log the failure, - the failure will go completely > unnoticed. > > This ticket is to review the usage of ExecutorService#submit method in the > codebase, and replace those with Executor#execute where appropriate. > > Originally brought up in the dev mailing list: > [https://lists.apache.org/thread/5f1965rltcspgw0j8nzcn2qnz9l4s8qm] -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-17497) Pull replicas throws AlreadyClosedException
[
https://issues.apache.org/jira/browse/SOLR-17497?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894641#comment-17894641
]
ASF subversion and git services commented on SOLR-17497:
Commit cc30093c5ee988555389b50cf2333edf743bb50f in solr's branch
refs/heads/main from Sanjay Dutt
[ https://gitbox.apache.org/repos/asf?p=solr.git;h=cc30093c5ee ]
SOLR-17448 SOLR-17497: IndexFetcher, catch exception instead of bubbling up
uncaught (#2800)
> Pull replicas throws AlreadyClosedException
> -
>
> Key: SOLR-17497
> URL: https://issues.apache.org/jira/browse/SOLR-17497
> Project: Solr
> Issue Type: Task
>Reporter: Sanjay Dutt
>Priority: Major
> Attachments: Screenshot 2024-10-23 at 6.01.02 PM.png
>
>
> Recently, a common exception (org.apache.lucene.store.AlreadyClosedException:
> this Directory is closed) seen in multiple failed test cases.
> FAILED: org.apache.solr.cloud.TestPullReplica.testKillPullReplica
> FAILED:
> org.apache.solr.cloud.SplitShardWithNodeRoleTest.testSolrClusterWithNodeRoleWithPull
> FAILED: org.apache.solr.cloud.TestPullReplica.testAddDocs
>
>
> {code:java}
> com.carrotsearch.randomizedtesting.UncaughtExceptionError: Captured an
> uncaught exception in thread: Thread[id=10271,
> name=fsyncService-6341-thread-1, state=RUNNABLE,
> group=TGRP-SplitShardWithNodeRoleTest]
> at
> __randomizedtesting.SeedInfo.seed([3F7DACB3BC44C3C4:E5DB3E97188A8EB9]:0)
> Caused by: org.apache.lucene.store.AlreadyClosedException: this Directory is
> closed
> at __randomizedtesting.SeedInfo.seed([3F7DACB3BC44C3C4]:0)
> at
> app//org.apache.lucene.store.BaseDirectory.ensureOpen(BaseDirectory.java:50)
> at
> app//org.apache.lucene.store.ByteBuffersDirectory.sync(ByteBuffersDirectory.java:237)
> at
> app//org.apache.lucene.tests.store.MockDirectoryWrapper.sync(MockDirectoryWrapper.java:214)
> at
> app//org.apache.solr.handler.IndexFetcher$DirectoryFile.sync(IndexFetcher.java:2034)
> at
> app//org.apache.solr.handler.IndexFetcher$FileFetcher.lambda$fetch$0(IndexFetcher.java:1803)
> at
> app//org.apache.solr.common.util.ExecutorUtil$MDCAwareThreadPoolExecutor.lambda$execute$1(ExecutorUtil.java:449)
> at
> java.base@11.0.24/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
> at
> java.base@11.0.24/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
> at java.base@11.0.24/java.lang.Thread.run(Thread.java:829)
> {code}
>
> Interesting thing about these test cases is that they all share same kind of
> setup where each has one shard and two replicas – one NRT and another is PULL.
>
> Going through one of the test case execution step.
> FAILED: org.apache.solr.cloud.TestPullReplica.testKillPullReplica
>
> Test flow
> 1. Create a collection with 1 NRT and 1 PULL replica
> 2. waitForState
> 3. waitForNumDocsInAllActiveReplicas(0); // *Name says it all*
> 4. Index another document.
> 5. waitForNumDocsInAllActiveReplicas(1);
> 6. Stop Pull replica
> 7. Index another document
> 8. waitForNumDocsInAllActiveReplicas(2);
> 9. Start Pull Replica
> 10. waitForState
> 11. waitForNumDocsInAllActiveReplicas(2);
>
> As per the logs the whole sequence executed successfully. Here is the link to
> the logs:
> [https://ge.apache.org/s/yxydiox3gvlf2/tests/task/:solr:core:test/details/org.apache.solr.cloud.TestPullReplica/testKillPullReplica/1/output]
> (link may stop working in the future)
>
> Last step where they are making sure that all the active replicas should have
> two documents each has logged a info which is another proof that it completed
> successfully.
>
> {code:java}
> 616575 INFO
> (TEST-TestPullReplica.testKillPullReplica-seed#[F30CC837FDD0DC28]) [n: c: s:
> r: x: t:] o.a.s.c.TestPullReplica Replica core_node3
> (https://127.0.0.1:35647/solr/pull_replica_test_kill_pull_replica_shard1_replica_n1/)
> has all 2 docs 616606 INFO (qtp1091538342-13057-null-11348)
> [n:127.0.0.1:38207_solr c:pull_replica_test_kill_pull_replica s:shard1
> r:core_node4 x:pull_replica_test_kill_pull_replica_shard1_replica_p2
> t:null-11348] o.a.s.c.S.Request webapp=/solr path=/select
> params={q=*:*&wt=javabin&version=2} rid=null-11348 hits=2 status=0 QTime=0
> 616607 INFO
> (TEST-TestPullReplica.testKillPullReplica-seed#[F30CC837FDD0DC28]) [n: c: s:
> r: x: t:] o.a.s.c.TestPullReplica Replica core_node4
> (https://127.0.0.1:38207/solr/pull_replica_test_kill_pull_replica_shard1_replica_p2/)
> has all 2 docs{code}
>
> *Where is the issue then?*
> In the logs it has been observed, that after restarting the PULL replica. The
> recovery process started and after fetching all the files info from the NRT,
> the replication
Re: [PR] SOLR-17448 SOLR-17497: IndexFetcher, catch exception instead of bubbling up uncaught [solr]
iamsanjay merged PR #2800: URL: https://github.com/apache/solr/pull/2800 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824240009
##
solr/packaging/test/test_snapshots.bats:
##
@@ -59,15 +59,15 @@ teardown() {
@test "snapshot list" {
solr snapshot-create -c films --snapshot-name snapshot3 --solr-url
http://localhost:${SOLR_PORT}
- run solr snapshot-list -c films -url http://localhost:${SOLR_PORT}/solr
+ run solr snapshot-list -c films -s http://localhost:${SOLR_PORT}/solr
Review Comment:
good questin, and I wonder if we normalize anyway...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824239234
##
solr/core/src/java/org/apache/solr/cli/SolrCLI.java:
##
@@ -215,18 +150,16 @@ public static void exit(int exitStatus) {
public static void main(String[] args) throws Exception {
final boolean hasNoCommand =
args == null || args.length == 0 || args[0] == null ||
args[0].trim().length() == 0;
-final boolean isHelpCommand =
-!hasNoCommand && Arrays.asList("-h", "--help", "/?").contains(args[0]);
+final boolean isHelpCommand = !hasNoCommand && Arrays.asList("-h",
"--help").contains(args[0]);
if (hasNoCommand || isHelpCommand) {
printHelp();
exit(1);
}
-if (Arrays.asList("-version", "version").contains(args[0])) {
- // select the version tool to be run
- CLIO.out("Deprecated operation as of 9.8. Please use bin/solr
--version.");
- args = new String[] {"version"};
+if (args[0].equalsIgnoreCase("version")) {
+ CLIO.out("version is not a valid command! Did you mean --version?\n");
+ exit(1);
Review Comment:
so this is a bit of a werid one, which is right now `bin/solr version` works
the same as `bin/solr --version`...Should we keep the check and just give
the same stock error message that we do if you do `bin/solr fakecommand`, which
would be "fakecommand is not a valid command!"???
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824242674
##
solr/packaging/test/test_snapshots.bats:
##
@@ -59,15 +59,15 @@ teardown() {
@test "snapshot list" {
solr snapshot-create -c films --snapshot-name snapshot3 --solr-url
http://localhost:${SOLR_PORT}
- run solr snapshot-list -c films -url http://localhost:${SOLR_PORT}/solr
+ run solr snapshot-list -c films -s http://localhost:${SOLR_PORT}/solr
Review Comment:
i checked hte other bats tests, and yes, we normalize away the /solr. I am
going to add a comment though that it's here to confirm that we continue to
handle trailing `/solr` properly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17383: Fix support for deprecated options in 9x [solr]
epugh commented on PR #2819: URL: https://github.com/apache/solr/pull/2819#issuecomment-2449795520 If this is important to a 9.7.1, then yes. I think what we normally do is communicate in the release thread on dev@ about these things. Otherwise, being on branch_9x is fine because it'll be picked up in 9.8 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820: URL: https://github.com/apache/solr/pull/2820#issuecomment-2449861488 for "AuthTool uses flags with Boolean arguments, should be deprecated and changed before 10" we should make another ticket. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824243229
##
solr/packaging/test/test_snapshots.bats:
##
@@ -59,15 +59,15 @@ teardown() {
@test "snapshot list" {
solr snapshot-create -c films --snapshot-name snapshot3 --solr-url
http://localhost:${SOLR_PORT}
- run solr snapshot-list -c films -url http://localhost:${SOLR_PORT}/solr
+ run solr snapshot-list -c films -s http://localhost:${SOLR_PORT}/solr
Review Comment:
i don't know if in a future solr 11 that we actually just refuse to work
with `/solr` ;-).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-16390: Tweak clusterprop APIs to be more REST-ful [solr]
gerlowskija commented on PR #1993: URL: https://github.com/apache/solr/pull/1993#issuecomment-2449994798 Superceded by #2788; closing! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-16390: Tweak clusterprop APIs to be more REST-ful [solr]
gerlowskija closed pull request #1993: SOLR-16390: Tweak clusterprop APIs to be more REST-ful URL: https://github.com/apache/solr/pull/1993 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
janhoy commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824575199
##
solr/core/src/java/org/apache/solr/cli/SolrCLI.java:
##
@@ -215,18 +150,16 @@ public static void exit(int exitStatus) {
public static void main(String[] args) throws Exception {
final boolean hasNoCommand =
args == null || args.length == 0 || args[0] == null ||
args[0].trim().length() == 0;
-final boolean isHelpCommand =
-!hasNoCommand && Arrays.asList("-h", "--help", "/?").contains(args[0]);
+final boolean isHelpCommand = !hasNoCommand && Arrays.asList("-h",
"--help").contains(args[0]);
if (hasNoCommand || isHelpCommand) {
printHelp();
exit(1);
}
-if (Arrays.asList("-version", "version").contains(args[0])) {
- // select the version tool to be run
- CLIO.out("Deprecated operation as of 9.8. Please use bin/solr
--version.");
- args = new String[] {"version"};
+if (args[0].equalsIgnoreCase("version")) {
+ CLIO.out("version is not a valid command! Did you mean --version?\n");
+ exit(1);
Review Comment:
I feel the `--version` flag should report the version of the local Solr CLI
program, but if we implement a `version` cmd that accepts `--solr-url` then it
should report the version of the remote solr host?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-11191) Shard Split doesn't work on indexes that have child documents
[ https://issues.apache.org/jira/browse/SOLR-11191?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894591#comment-17894591 ] ASF subversion and git services commented on SOLR-11191: Commit b0ceb052051e53b81ecbd598990f944ff0e370a2 in solr's branch refs/heads/branch_9x from David Smiley [ https://gitbox.apache.org/repos/asf?p=solr.git;h=b0ceb052051 ] SOLR-11191: fix SplitShardTest.testWithChildDocuments The delete parent shard trick wasn't reliable; parent may still be active. So use activeClusterShape based on the 9x definition; differs from 10x > Shard Split doesn't work on indexes that have child documents > - > > Key: SOLR-11191 > URL: https://issues.apache.org/jira/browse/SOLR-11191 > Project: Solr > Issue Type: Bug >Reporter: Varun Thacker >Assignee: David Smiley >Priority: Major > Labels: NestedDocuments, pull-request-available > Fix For: 9.8 > > Time Spent: 7.5h > Remaining Estimate: 0h > > The split shard command doesn't split a shard correctly when the index has > parent-child documents. > The way split shard works is it goes through all documents id's in that shard > and then decides which sub-shard would it belong in . It is not aware of the > parent child relationship during this process > So the parent-child documents could be orphaned and end up in different shard > Secondly, even with the routing of parent and child documents were the same > split shards needs to re-index them as a block -- This message was sent by Atlassian Jira (v8.20.10#820010) - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Updated] (SOLR-17535) Remove ClusterState.getCollectionStates() and getCollectionsMap()
[
https://issues.apache.org/jira/browse/SOLR-17535?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
David Smiley updated SOLR-17535:
Description:
To avoid creating intermediary maps for ClusterState consumers, and to limit
the direct usages of CollectionRef, I propose removing both getCollectionStates
and getCollectionsMap. This refactoring helps with any future evolution of
ClusterState. Instead, callers can use forEachCollection or a new
{{Stream}} one proposed here.
{code:java}
/** Streams the resolved DocCollections. Use this sparingly in case there are
many collections. */
public Stream collectionStream() {
return
collectionStates.values().stream().map(CollectionRef::get).filter(Objects::nonNull);
}
{code}
was:To avoid creating intermediary maps for ClusterState consumers, and to
limit the direct usages of CollectionRef, I propose removing both
getCollectionStates and getCollectionsMap. This also unblocks future changes
to work in a more scalable manner. Instead, callers can use forEachCollection
or a new {{Stream}} one proposed here.
> Remove ClusterState.getCollectionStates() and getCollectionsMap()
> -
>
> Key: SOLR-17535
> URL: https://issues.apache.org/jira/browse/SOLR-17535
> Project: Solr
> Issue Type: Improvement
> Security Level: Public(Default Security Level. Issues are Public)
> Components: SolrCloud
>Reporter: David Smiley
>Assignee: David Smiley
>Priority: Major
>
> To avoid creating intermediary maps for ClusterState consumers, and to limit
> the direct usages of CollectionRef, I propose removing both
> getCollectionStates and getCollectionsMap. This refactoring helps with any
> future evolution of ClusterState. Instead, callers can use forEachCollection
> or a new {{Stream}} one proposed here.
> {code:java}
> /** Streams the resolved DocCollections. Use this sparingly in case there
> are many collections. */
> public Stream collectionStream() {
> return
> collectionStates.values().stream().map(CollectionRef::get).filter(Objects::nonNull);
> }
> {code}
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on PR #2820: URL: https://github.com/apache/solr/pull/2820#issuecomment-2449839719 I hope in the future `solr.cmd` doesn't have helper methods like `parse_config_args` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17516: LBHttpSolrClient: support HttpJdkSolrClient [solr]
janhoy commented on PR #2805: URL: https://github.com/apache/solr/pull/2805#issuecomment-2449966915 > Users generally don't refer to the LB client nor ClusterStateProvider; we shouldn't constrain ourselves, especially in a major release. Agree, wouldn't care too much about breaking these two APIs. Also, if there is will and energy to refactor things for 10.0, it is better for users to take the hit in v10 than doing yet another change for v11. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
gerlowskija commented on code in PR #2811:
URL: https://github.com/apache/solr/pull/2811#discussion_r1824584360
##
solr/core/src/test/org/apache/solr/handler/TestUserManagedReplicationWithAuth.java:
##
@@ -227,26 +228,26 @@ private QueryResponse queryWithBasicAuth(SolrClient
client, SolrQuery q)
return withBasicAuth(new QueryRequest(q)).process(client);
}
- private void disablePoll(JettySolrRunner Jetty, SolrClient solrClient)
+ private void disablePoll(JettySolrRunner Jetty, Http2SolrClient solrClient)
throws SolrServerException, IOException {
ModifiableSolrParams disablePollParams = new ModifiableSolrParams();
disablePollParams.set(COMMAND, CMD_DISABLE_POLL);
disablePollParams.set(CommonParams.WT, JAVABIN);
disablePollParams.set(CommonParams.QT, ReplicationHandler.PATH);
QueryRequest req = new QueryRequest(disablePollParams);
withBasicAuth(req);
-req.setBasePath(buildUrl(Jetty.getLocalPort()));
-solrClient.request(req, DEFAULT_TEST_CORENAME);
+final var baseUrl = buildUrl(Jetty.getLocalPort());
+solrClient.requestWithBaseUrl(baseUrl, DEFAULT_TEST_CORENAME, req);
}
private void pullIndexFromTo(
JettySolrRunner srcSolr, JettySolrRunner destSolr, boolean authEnabled)
throws SolrServerException, IOException {
String srcUrl = buildUrl(srcSolr.getLocalPort()) + "/" +
DEFAULT_TEST_CORENAME;
-String destUrl = buildUrl(destSolr.getLocalPort()) + "/" +
DEFAULT_TEST_CORENAME;
QueryRequest req = getQueryRequestForFetchIndex(authEnabled, srcUrl);
-req.setBasePath(buildUrl(destSolr.getLocalPort()));
+final var baseUrl = buildUrl(destSolr.getLocalPort());
+followerClient.requestWithBaseUrl(baseUrl, DEFAULT_TEST_CORENAME, req);
followerClient.request(req, DEFAULT_TEST_CORENAME);
Review Comment:
Great catch; done!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17256: Remove usages of deprecated SolrRequest.setBasePath [solr]
gerlowskija commented on code in PR #2811:
URL: https://github.com/apache/solr/pull/2811#discussion_r1824597751
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java:
##
@@ -358,28 +358,29 @@ private void addRunner() {
@Override
public NamedList request(final SolrRequest request, String
collection)
throws SolrServerException, IOException {
-if (ClientUtils.shouldApplyDefaultCollection(collection, request))
- collection = defaultCollection;
+final String effectiveCollection =
+ClientUtils.shouldApplyDefaultCollection(collection, request)
+? defaultCollection
+: collection;
Review Comment:
Two reasons:
1. The lambda usage in L366 requires a "final or effectively final"
variable, so "collection" cannot be used there, just from a compilation
perspective.
2. Much less important, but I try to avoid modifying method args [from a
best-practices
perspective](https://stackoverflow.com/questions/12019978/is-it-a-good-practice-to-change-arguments-in-java).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[PR] SOLR-17538: CloudHttp2SolrClient needs a custom ClusterStateProvider option [solr]
iamsanjay opened a new pull request, #2832: URL: https://github.com/apache/solr/pull/2832 https://issues.apache.org/jira/browse/SOLR-17538 # Checklist Please review the following and check all that apply: - [x] I have reviewed the guidelines for [How to Contribute](https://github.com/apache/solr/blob/main/CONTRIBUTING.md) and my code conforms to the standards described there to the best of my ability. - [x] I have created a Jira issue and added the issue ID to my pull request title. - [x] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended, not available for branches on forks living under an organisation) - [x] I have developed this patch against the `main` branch. - [x] I have run `./gradlew check`. - [ ] I have added tests for my changes. - [ ] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[jira] [Commented] (SOLR-17537) Let Curator handle state compression in ZooKeeper
[
https://issues.apache.org/jira/browse/SOLR-17537?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17894692#comment-17894692
]
Eric Pugh commented on SOLR-17537:
--
I really really really like this idea. I ran into the compression stuff in one
of the cli tools and it requires the cli tool to have access to Solr xml (or
something frustrating like that).
> Let Curator handle state compression in ZooKeeper
> -
>
> Key: SOLR-17537
> URL: https://issues.apache.org/jira/browse/SOLR-17537
> Project: Solr
> Issue Type: Sub-task
> Security Level: Public(Default Security Level. Issues are Public)
>Reporter: Houston Putman
>Priority: Major
>
> Curator has an interface {{{}CompressionProvider{}}}, that can be provided
> when building a {{CuratorFramework}} client. We can create a
> CompressionProvider that wraps our custom compression logic, so that Curator
> will handle it for us.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[PR] Update org.apache.hadoop:* to v3.4.1 [solr]
solrbot opened a new pull request, #2829: URL: https://github.com/apache/solr/pull/2829 This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | org.apache.hadoop:hadoop-minikdc | test | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-hdfs | test | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-client-minicluster | test | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-common | dependencies | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-client-runtime | dependencies | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-client-api | dependencies | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-auth | dependencies | patch | `3.4.0` -> `3.4.1` | | org.apache.hadoop:hadoop-annotations | dependencies | patch | `3.4.0` -> `3.4.1` | --- ### Configuration 📅 **Schedule**: Branch creation - "before 9am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/solrbot/renovate-github-action) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
[PR] Update dependency org.bouncycastle:bcpkix-jdk18on to v1.79 [solr]
solrbot opened a new pull request, #2830: URL: https://github.com/apache/solr/pull/2830 This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [org.bouncycastle:bcpkix-jdk18on](https://www.bouncycastle.org/java.html) ([source](https://redirect.github.com/bcgit/bc-java)) | test | minor | `1.78.1` -> `1.79` | --- ### Configuration 📅 **Schedule**: Branch creation - "before 9am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/solrbot/renovate-github-action) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] Actually make collections PRS enabled in tests [solr]
dsmiley commented on PR #2824: URL: https://github.com/apache/solr/pull/2824#issuecomment-2450823568 Even if today we only use it for testing (because only we know of its secret existence), isn't the same mechanism appropriate for a cluster? It needn't be the *only* way to set it, of course; I could imagine additional layers like cluster props or solr.xml. `solr.cloud.prs.enabled` then -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17352: Remove deprecated options from CLI [solr]
epugh commented on code in PR #2820:
URL: https://github.com/apache/solr/pull/2820#discussion_r1824235207
##
solr/core/src/java/org/apache/solr/cli/ApiTool.java:
##
@@ -57,37 +56,19 @@ public List getOptions() {
.longOpt("solr-url")
.argName("URL")
.hasArg()
-.required(false) // swap back to required when we eliminate
deprecated option
-.desc("Send a GET request to a Solr API endpoint.")
-.build(),
-Option.builder("get")
-.longOpt("get")
-.deprecated(
-DeprecatedAttributes.builder()
-.setForRemoval(true)
-.setSince("9.7")
-.setDescription("Use --solr-url instead")
-.get())
-.argName("URL")
-.hasArg()
-.required(false)
+.required(true)
.desc("Send a GET request to a Solr API endpoint.")
.build(),
SolrCLI.OPTION_CREDENTIALS);
}
@Override
public void runImpl(CommandLine cli) throws Exception {
-String response = null;
-String getUrl =
-cli.hasOption("solr-url") ? cli.getOptionValue("solr-url") :
cli.getOptionValue("get");
-if (getUrl != null) {
- response = callGet(getUrl,
cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt()));
-}
-if (response != null) {
- // pretty-print the response to stdout
- echo(response);
-}
+String getUrl = cli.getOptionValue("solr-url");
+String response = callGet(getUrl,
cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt()));
+
+// pretty-print the response to stdout
+echo(response);
Review Comment:
or a bats test!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
[PR] Update org.mockito:mockito* to v5.14.2 [solr]
solrbot opened a new pull request, #2831: URL: https://github.com/apache/solr/pull/2831 This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [org.mockito:mockito-subclass](https://redirect.github.com/mockito/mockito) | test | minor | `5.12.0` -> `5.14.2` | | [org.mockito:mockito-core](https://redirect.github.com/mockito/mockito) | test | minor | `5.12.0` -> `5.14.2` | --- ### Release Notes mockito/mockito (org.mockito:mockito-subclass) ### [`v5.14.2`](https://redirect.github.com/mockito/mockito/releases/tag/v5.14.2) *Changelog generated by [Shipkit Changelog Gradle Plugin](https://redirect.github.com/shipkit/shipkit-changelog)* # 5.14.2 - 2024-10-15 - [12 commit(s)](https://redirect.github.com/mockito/mockito/compare/v5.14.1...v5.14.2) by Brice Dutheil, Rafael Winterhalter, dependabot\[bot] - Fix [#3466](https://redirect.github.com/mockito/mockito/issues/3466) nexus publishing configuration [(#3470)](https://redirect.github.com/mockito/mockito/pull/3470) - Bump org.jetbrains.kotlin:kotlin-stdlib from 2.0.20 to 2.0.21 [(#3468)](https://redirect.github.com/mockito/mockito/pull/3468) - Bump bytebuddy from 1.15.3 to 1.15.4 [(#3467)](https://redirect.github.com/mockito/mockito/pull/3467) - Missing 5.14.2 release [(#3466)](https://redirect.github.com/mockito/mockito/issues/3466) - chore: Tests whether JVM warnings / messages on dynamic attach [(#3462)](https://redirect.github.com/mockito/mockito/pull/3462) - Bump junit-jupiter from 5.11.1 to 5.11.2 [(#3461)](https://redirect.github.com/mockito/mockito/pull/3461) - Renames extension modules with `mockito-` prefix [(#3460)](https://redirect.github.com/mockito/mockito/pull/3460) - Avoid attach warning if Byte Buddy is configured for command-line attach. [(#3459)](https://redirect.github.com/mockito/mockito/pull/3459) - Bump org.shipkit:shipkit-auto-version from 2.0.10 to 2.0.11 [(#3458)](https://redirect.github.com/mockito/mockito/pull/3458) - Bump junit-jupiter from 5.11.0 to 5.11.1 [(#3455)](https://redirect.github.com/mockito/mockito/pull/3455) - Move root project to dedicated core folder [(#3444)](https://redirect.github.com/mockito/mockito/issues/3444) - Bump biz.aQute.bnd:biz.aQute.bnd.gradle from 6.4.0 to 7.0.0 [(#3136)](https://redirect.github.com/mockito/mockito/pull/3136) ### [`v5.14.1`](https://redirect.github.com/mockito/mockito/releases/tag/v5.14.1) *Changelog generated by [Shipkit Changelog Gradle Plugin](https://redirect.github.com/shipkit/shipkit-changelog)* # 5.14.1 - 2024-09-30 - [2 commit(s)](https://redirect.github.com/mockito/mockito/compare/v5.14.0...v5.14.1) by Brice Dutheil, dependabot\[bot] - fix: gradle mockitoAgent configuration should not be transitive [(#3454)](https://redirect.github.com/mockito/mockito/pull/3454) - Bump bytebuddy from 1.15.2 to 1.15.3 [(#3452)](https://redirect.github.com/mockito/mockito/pull/3452) - Allow for installing a Java agent within the Mockito jar, without exposing Byte Buddy's attach mechanism. [(#3437)](https://redirect.github.com/mockito/mockito/pull/3437) ### [`v5.14.0`](https://redirect.github.com/mockito/mockito/releases/tag/v5.14.0) *Changelog generated by [Shipkit Changelog Gradle Plugin](https://redirect.github.com/shipkit/shipkit-changelog)* # 5.14.0 - 2024-09-27 - [9 commit(s)](https://redirect.github.com/mockito/mockito/compare/v5.13.0...v5.14.0) by Ali-Hassan, Brice Dutheil, David Saff, Rafael Winterhalter, dependabot\[bot] - Bump org.junit.platform:junit-platform-launcher from 1.11.0 to 1.11.1 [(#3451)](https://redirect.github.com/mockito/mockito/pull/3451) - Bump bytebuddy from 1.15.1 to 1.15.2 [(#3450)](https://redirect.github.com/mockito/mockito/pull/3450) - Update Documentation of ArgumentCaptor.java [(#3448)](https://redirect.github.com/mockito/mockito/pull/3448) - Split subprojects [(#3447)](https://redirect.github.com/mockito/mockito/pull/3447) - Separate extensions from integration tests [(#3443)](https://redirect.github.com/mockito/mockito/issues/3443) - Bump org.eclipse.platform:org.eclipse.osgi from 3.20.0 to 3.21.0 [(#3440)](https://redirect.github.com/mockito/mockito/pull/3440) - Bump com.gradle.enterprise from 3.18 to 3.18.1 [(#3439)](https://redirect.github.com/mockito/mockito/pull/3439) - Allow for installing a Java agent within the Mockito jar, without exposing Byte Buddy's attach mechanism. [(#3437)](https://redirect.github.com/mockito/mockito/pull/3437) - Bump bytebuddy from 1.15.0 to 1.15.1 [(#3434)](https://redirect.github.com/mockito/mockito/pull/3434) - Fixes [#3419](https://redirect.github.com/mockito/mockito/issues/3419): Disable mocks with an error message [(#3424)](https://redirect.git
Re: [PR] SOLR-16116: Use apache curator to manage the Solr Zookeeper interactions [solr]
iamsanjay commented on PR #760: URL: https://github.com/apache/solr/pull/760#issuecomment-2451302759 Possibility of relating to this one. Build scan data https://ge.apache.org/s/63ya5yavjnh5o > Error from server at http://127.0.0.1:43991/solr: Cannot talk to ZooKeeper - Updates are disabled. ``` org.apache.solr.cloud.BasicDistributedZk2Test.test (:solr:core) Test history: https://ge.apache.org/scans/tests?search.rootProjectNames=solr-root&tests.container=org.apache.solr.cloud.BasicDistributedZk2Test&tests.test=test http://fucit.org/solr-jenkins-reports/history-trend-of-recent-failures.html#series/org.apache.solr.cloud.BasicDistributedZk2Test.test Test output: /tmp/src/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.cloud.BasicDistributedZk2Test.txt Reproduce with: ./gradlew :solr:core:test --tests "org.apache.solr.cloud.BasicDistributedZk2Test.test" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=5426200A04BA10C -Ptests.timeoutSuite=60! -Ptests.file.encoding=UTF-8 ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
Re: [PR] SOLR-17516: LBHttpSolrClient: support HttpJdkSolrClient (Generic Version) [solr]
dsmiley commented on code in PR #2828:
URL: https://github.com/apache/solr/pull/2828#discussion_r1825196815
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java:
##
@@ -173,8 +173,8 @@ public NamedList request(SolrRequest
solrRequest, String collection)
"Timeout occurred while waiting response from server at: " +
pReq.url, e);
} catch (SolrException se) {
throw se;
-} catch (RuntimeException re) {
- throw new SolrServerException(re);
+} catch (IOException | RuntimeException e) {
Review Comment:
The request method declares it throws IOException; shouldn't we propagate it
instead of wrap?
##
solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttp2SolrClientTest.java:
##
@@ -50,8 +52,8 @@ public void
testLBHttp2SolrClientWithTheseParamNamesInTheUrl() {
try (Http2SolrClient http2SolrClient =
new
Http2SolrClient.Builder(url).withTheseParamNamesInTheUrl(urlParamNames).build();
Review Comment:
perhaps some tests methods shouldn't care in theory what the httpSolrClient
impl is exactly but it'd be nice to get one randomly or via parameterization
even better. Not sure if that'd be too difficult.
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java:
##
@@ -37,9 +37,9 @@
import org.slf4j.MDC;
/**
- * LBHttp2SolrClient or "LoadBalanced LBHttp2SolrClient" is a load balancing
wrapper around {@link
- * Http2SolrClient}. This is useful when you have multiple Solr endpoints and
requests need to be
- * Load Balanced among them.
+ * LBHttp2SolrClient or "LoadBalanced Http Solr Client" is a load balancing
wrapper around a Http
Review Comment:
Don't need to share the name of our own class redundantly
##
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java:
##
@@ -284,16 +286,16 @@ private void onFailedRequest(
}
}
- public static class Builder {
+ public static class Builder {
-private final Http2SolrClient http2SolrClient;
-private final Endpoint[] solrEndpoints;
+private final C solrClient;
+private final LBSolrClient.Endpoint[] solrEndpoints;
private long aliveCheckIntervalMillis =
TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); // 1 minute
between checks
protected String defaultCollection;
-public Builder(Http2SolrClient http2Client, Endpoint... endpoints) {
- this.http2SolrClient = http2Client;
+public Builder(C http2Client, LBSolrClient.Endpoint... endpoints) {
Review Comment:
Can you add a static import for that Endpoint inner class so it looks simple
as it was?
minor but can you please rename "http2Client" to incorporate the name "Solr"
like just call it "solrClient" is fine. I like a SolrClient and HttpClient to
not be confusable.
##
solr/solrj/src/test/org/apache/solr/client/solrj/impl/MockTrustManager.java:
##
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.impl;
+
+import java.net.Socket;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedTrustManager;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.util.SSLTestConfig;
+
+/**
+ * Taken from: https://www.baeldung.com/java-httpclient-ssl sec 4.1,
2024/02/12. This is an
+ * all-trusting Trust Manager. Works with self-signed certificates.
+ */
+public class MockTrustManager extends X509ExtendedTrustManager {
Review Comment:
nice to see this separated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@solr.ap
