diff --git a/solr/bin/solr b/solr/bin/solr index acb627b5886..04e91a413e0 100755 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -946,7 +946,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then exit 1 fi - run_tool healthcheck -zkHost "$ZK_HOST" -collection "$HEALTHCHECK_COLLECTION" $VERBOSE + run_tool healthcheck -z "$ZK_HOST" -c "$HEALTHCHECK_COLLECTION" $VERBOSE exit $? fi diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd index 4c916c78eb5..6038c98ee53 100755 --- a/solr/bin/solr.cmd +++ b/solr/bin/solr.cmd @@ -1548,7 +1548,7 @@ echo ZK_HOST: !ZK_HOST! "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^ -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^ - org.apache.solr.cli.SolrCLI healthcheck -collection !HEALTHCHECK_COLLECTION! -zkHost !ZK_HOST! %HEALTHCHECK_VERBOSE% + org.apache.solr.cli.SolrCLI healthcheck -c !HEALTHCHECK_COLLECTION! -z !ZK_HOST! %HEALTHCHECK_VERBOSE% goto done :run_solrcli diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java index 6f869e990e5..1f67bb02b83 100644 --- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java +++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java @@ -45,6 +45,7 @@ import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.params.CollectionAdminParams; import org.apache.solr.common.params.CommonParams; +import org.apache.solr.common.util.EnvUtils; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.ConfigSetService; import org.noggit.CharArr; @@ -148,16 +149,36 @@ public List