You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/07/20 10:20:35 UTC
[lucene-solr] branch jira/solr-14656-master updated: SOLR-14656:
Script changes
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-14656-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-14656-master by this push:
new 682453c SOLR-14656: Script changes
682453c is described below
commit 682453cceb0dd25f0373101216ff2f908aa26f2a
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Mon Jul 20 15:50:06 2020 +0530
SOLR-14656: Script changes
---
solr/bin/solr | 7 +------
solr/bin/solr.cmd | 10 +---------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/solr/bin/solr b/solr/bin/solr
index 83d247c..7e3cf0c6 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -330,7 +330,7 @@ function print_usage() {
if [ -z "$CMD" ]; then
echo ""
echo "Usage: solr COMMAND OPTIONS"
- echo " where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling, export"
+ echo " where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, export"
echo ""
echo " Standalone server example (start Solr running in the background on port 8984):"
echo ""
@@ -1417,11 +1417,6 @@ if [[ "$SCRIPT_CMD" == "zk" ]]; then
fi
-if [[ "$SCRIPT_CMD" == "autoscaling" ]]; then
- run_tool autoscaling $@
- exit $?
-fi
-
if [[ "$SCRIPT_CMD" == "export" ]]; then
run_tool export $@
exit $?
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 4b4d813..8fb5e7a 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -224,7 +224,6 @@ IF "%1"=="version" goto get_version
IF "%1"=="-v" goto get_version
IF "%1"=="-version" goto get_version
IF "%1"=="assert" goto run_assert
-IF "%1"=="autoscaling" goto run_autoscaling
IF "%1"=="export" goto run_export
IF "%1"=="package" goto run_package
@@ -303,7 +302,7 @@ goto done
:script_usage
@echo.
@echo Usage: solr COMMAND OPTIONS
-@echo where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling, export
+@echo where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, export
@echo.
@echo Standalone server example (start Solr running in the background on port 8984):
@echo.
@@ -1454,13 +1453,6 @@ if errorlevel 1 (
)
goto done
-:run_autoscaling
-"%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.util.SolrCLI %*
-goto done:
-
:run_export
"%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" ^