epugh commented on code in PR #3347:
URL: https://github.com/apache/solr/pull/3347#discussion_r2098882553
##########
solr/core/src/java/org/apache/solr/cli/RunExampleTool.java:
##########
@@ -230,17 +230,13 @@ public void runImpl(CommandLine cli) throws Exception {
throw new IllegalArgumentException(
"Value of --script option is invalid! " + script + " not found");
} else {
- Path scriptFile = serverDir.getParent().resolve("bin").resolve("solr");
+ Path scriptFile =
+ serverDir.getParent().resolve("bin").resolve(CLIUtils.isWindows() ?
"solr.cmd" : "solr");
if (Files.isRegularFile(scriptFile)) {
script = scriptFile.toAbsolutePath().toString();
} else {
- scriptFile = serverDir.getParent().resolve("bin").resolve("solr.cmd");
- if (Files.isRegularFile(scriptFile)) {
- script = scriptFile.toAbsolutePath().toString();
- } else {
- throw new IllegalArgumentException(
- "Cannot locate the bin/solr script! Please pass --script to this
application.");
- }
+ throw new IllegalArgumentException(
+ "Cannot locate the bin/solr script! Please pass --script to this
application.");
Review Comment:
maybe do the same `solr.cmd : solr` thing in the error message? nit pick
;_0
##########
solr/CHANGES.txt:
##########
@@ -291,6 +291,9 @@ Bug Fixes
* SOLR-17758: The NumFieldLimitingUpdateRequestProcessor's "warnOnly" mode has
been fixed, and now processes documents even
when the limit has been exceeded. (Jason Gerlowski, Rahul Goswami)
+* SOLR-7962: Passing additional arguments to solr.cmd using "--jvm-opts"
(formerly "-a") in conjunction with "-e" (examples like 'techproducts')
Review Comment:
Nice description!
##########
solr/packaging/test/test_example.bats:
##########
@@ -0,0 +1,41 @@
+#!/usr/bin/env bats
+
+# 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.
+
+load bats_helper
+
+setup() {
+ common_clean_setup
+}
+
+teardown() {
+ # save a snapshot of SOLR_HOME for failed tests
+ save_home_on_failure
+
+ solr stop --all >/dev/null 2>&1
+}
+
+@test "start -e cloud works with --jvm-opts" {
+ solr start -e cloud --no-prompt --jvm-opts "-Dcustom.prop=helloworld"
Review Comment:
nice that this is also a test that our cloud example starts! we didn't have
that in bats at all..
--
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
