Apache Solr open-source search software
SOLR-16876: Remove extra /solr from calls that generates extra WARNING in logs (#1833)
Eric Pugh81b81f0886b2
diff --git a/solr/bin/solr b/solr/bin/solrindex 7a83cfa82a6..5e2e46e9806 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -1172,7 +1172,7 @@ if [[ "$SCRIPT_CMD" == "auth" ]]; thenfidonefi- run_tool auth "${AUTH_PARAMS[@]}" -solrUrl "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:${AUTH_PORT:-8983}/solr" -authConfDir "$SOLR_HOME" $VERBOSE+ run_tool auth "${AUTH_PARAMS[@]}" -solrUrl "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:${AUTH_PORT:-8983}" -authConfDir "$SOLR_HOME" $VERBOSEexit $?fidiff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex e86b4a6265b..754b7b1e99f 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -1632,7 +1632,7 @@ if "!AUTH_PORT!"=="" (-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile "%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^- -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!AUTH_PORT!/solr+ -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!AUTH_PORT!goto donediff --git a/solr/packaging/test/test_auth.bats b/solr/packaging/test/test_auth.batsindex 99a6480a59f..0de3786c35e 100644--- a/solr/packaging/test/test_auth.bats+++ b/solr/packaging/test/test_auth.bats@@ -34,3 +34,17 @@ setup() {run ! solr auth enable -type basicAuth -credentials any:any -updateIncludeFileOnly tureassert_output --partial "Argument [updateIncludeFileOnly] must be either true or false, but was [ture]"}++@test "auth enable/disable lifecycle" {+ solr start -c+ solr auth enable -type basicAuth -credentials name:password+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000++ run curl -u name:password --basic "http://localhost:${SOLR_PORT}/solr/admin/collections?action=CREATE&collection.configName=_default&name=test&numShards=2&replicationFactor=1&router.name=compositeId&wt=json"+ assert_output --partial '"status":0'++ solr auth disable+ run curl "http://localhost:${SOLR_PORT}/solr/test/select?q=*:*"+ assert_output --partial '"numFound":0'+ solr stop -all+}diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adocindex cee57fcd806..2c1c3e925fa 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc@@ -330,7 +330,7 @@ For example, if Solr is running on port 8983, then the embedded ZooKeeper will l[IMPORTANT]====If your ZooKeeper connection string uses a chroot, such as `localhost:2181/solr`, then you need to create the /solr znode before launching SolrCloud using the `bin/solr` script.-++To do this use the `mkroot` command outlined below, for example: `bin/solr zk mkroot /solr -z 192.168.1.4:2181`====