diff --git a/bin/mqadmin.cmd b/bin/mqadmin.cmd index 9fee2d337c54a71446ae233d88581958d6f5f968..4e061f0ef93cc43af18b93cafc8a9bef70304a47 100644 --- a/bin/mqadmin.cmd +++ b/bin/mqadmin.cmd @@ -14,7 +14,5 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%ROCKETMQ_HOME%\bin\tools.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & goto end -call "%ROCKETMQ_HOME%\bin\tools.cmd" org.apache.rocketmq.tools.command.MQAdminStartup %* - -:end \ No newline at end of file +if not exist "%ROCKETMQ_HOME%\bin\tools.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & EXIT /B 1 +call "%ROCKETMQ_HOME%\bin\tools.cmd" org.apache.rocketmq.tools.command.MQAdminStartup %* \ No newline at end of file diff --git a/bin/mqbroker.cmd b/bin/mqbroker.cmd index d34a354e8c4e2bedc13652b9334b562066217333..3efb47577cc396b31292cd6f38bec6d6ccc63830 100644 --- a/bin/mqbroker.cmd +++ b/bin/mqbroker.cmd @@ -14,8 +14,10 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%ROCKETMQ_HOME%\bin\runbroker.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & goto end +if not exist "%ROCKETMQ_HOME%\bin\runbroker.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & EXIT /B 1 call "%ROCKETMQ_HOME%\bin\runbroker.cmd" org.apache.rocketmq.broker.BrokerStartup %* -:end \ No newline at end of file +IF %ERRORLEVEL% EQU 0 ( + ECHO "Broker starts OK" +) \ No newline at end of file diff --git a/bin/mqfiltersrv.cmd b/bin/mqfiltersrv.cmd index a56657d9386e598b7da529d421723f40e1934eab..0503026a3976ca7eb63b48cd6f7e52f9eee2f80d 100644 --- a/bin/mqfiltersrv.cmd +++ b/bin/mqfiltersrv.cmd @@ -14,8 +14,10 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%ROCKETMQ_HOME%\bin\runbroker.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & goto end +if not exist "%ROCKETMQ_HOME%\bin\runbroker.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & EXIT /B 1 call "%ROCKETMQ_HOME%\bin\runserver.cmd" org.apache.rocketmq.filtersrv.FiltersrvStartup %* -:end \ No newline at end of file +IF %ERRORLEVEL% EQU 0 ( + ECHO "Filtersrv starts OK" +) \ No newline at end of file diff --git a/bin/mqnamesrv.cmd b/bin/mqnamesrv.cmd index 5156378bebb904732329afd635d04abb858d0583..2828bdc28d0eb1c505738afac58b4af3bcfd9e1f 100644 --- a/bin/mqnamesrv.cmd +++ b/bin/mqnamesrv.cmd @@ -14,8 +14,10 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%ROCKETMQ_HOME%\bin\runserver.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & goto end +if not exist "%ROCKETMQ_HOME%\bin\runserver.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & EXIT /B 1 call "%ROCKETMQ_HOME%\bin\runserver.cmd" org.apache.rocketmq.namesrv.NamesrvStartup %* -:end \ No newline at end of file +IF %ERRORLEVEL% EQU 0 ( + ECHO "Namesrv starts OK" +) \ No newline at end of file diff --git a/bin/mqshutdown.cmd b/bin/mqshutdown.cmd index 47317d8c785c8fe1bc64ef785a9fe6c7c23d7f6d..50af026f7c05ff499be24cb25ce5eca36d6e8432 100644 --- a/bin/mqshutdown.cmd +++ b/bin/mqshutdown.cmd @@ -14,7 +14,7 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%JAVA_HOME%\bin\jps.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & goto end +if not exist "%JAVA_HOME%\bin\jps.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & EXIT /B 1 setlocal @@ -32,6 +32,4 @@ if /I "%1" == "broker" ( echo Done! ) else ( echo Unknown role to kill, please specify broker or namesrv -) - -:end \ No newline at end of file +) \ No newline at end of file diff --git a/bin/play.cmd b/bin/play.cmd index 545864af786d7fbf7ab09370448c93d93ec8b8c1..f1737d574dfcea0c586b7a37f205ff375402b397 100644 --- a/bin/play.cmd +++ b/bin/play.cmd @@ -14,6 +14,17 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -START /B mqnamesrv > ns.log -START /B mqbroker -n localhost:9876 > bk.log +START /B mqnamesrv > ns.log 2>&1 +IF %ERRORLEVEL% NEQ 0 ( + echo "Failed to start name server. Please check ns.log" + EXIT /B 1 +) + +START /B mqbroker -n localhost:9876 > bk.log 2>&1 + +IF %ERRORLEVEL% NEQ 0 ( + ECHO "Failed to start broker. Please check bk.log" + EXIT /B 1 +) + echo "Start Name Server and Broker Successfully." \ No newline at end of file diff --git a/bin/runbroker.cmd b/bin/runbroker.cmd index d18d47b8b19dd4c825bb0d8e600cf1c35ce54eef..033d8225e4dc3f3b45879d441ae86fe4ea4e8677 100644 --- a/bin/runbroker.cmd +++ b/bin/runbroker.cmd @@ -14,7 +14,7 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & goto end +if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & EXIT /B 1 set "JAVA=%JAVA_HOME%\bin\java.exe" setlocal @@ -28,9 +28,9 @@ set CLASSPATH=.;%BASE_DIR%conf;%CLASSPATH% rem =========================================================================================== rem JVM Configuration rem =========================================================================================== -set "JAVA_OPT=%JAVA_OPT% -server -Xms8g -Xmx8g -Xmn4g" +set "JAVA_OPT=%JAVA_OPT% -server -Xms2g -Xmx2g -Xmn1g" set "JAVA_OPT=%JAVA_OPT% -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8 -XX:+DisableExplicitGC" -set "JAVA_OPT=%JAVA_OPT% -verbose:gc -Xloggc:%HOMEPATH%\mq_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy" +set "JAVA_OPT=%JAVA_OPT% -verbose:gc -Xloggc:%USERPROFILE%\mq_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy" set "JAVA_OPT=%JAVA_OPT% -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=30m" set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow" set "JAVA_OPT=%JAVA_OPT% -XX:+AlwaysPreTouch" @@ -39,6 +39,4 @@ set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages -XX:-UseBiasedLocking" set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs=%BASE_DIR%lib" set "JAVA_OPT=%JAVA_OPT% -cp %CLASSPATH%" -"%JAVA%" %JAVA_OPT% %* - -:end \ No newline at end of file +"%JAVA%" %JAVA_OPT% %* \ No newline at end of file diff --git a/bin/runserver.cmd b/bin/runserver.cmd index 2d561f24ed3c37e326db1a125b1cb3cfd41fdbd6..e157d55fe91fdc9605216377f05908a9016e5dbe 100644 --- a/bin/runserver.cmd +++ b/bin/runserver.cmd @@ -15,7 +15,7 @@ rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & goto end +if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & EXIT /B 1 set "JAVA=%JAVA_HOME%\bin\java.exe" setlocal @@ -26,14 +26,12 @@ for %%d in (%BASE_DIR%) do set BASE_DIR=%%~dpd set CLASSPATH=.;%BASE_DIR%conf;%CLASSPATH% -set "JAVA_OPT=%JAVA_OPT% -server -Xms4g -Xmx4g -Xmn2g -XX:PermSize=128m -XX:MaxPermSize=320m" +set "JAVA_OPT=%JAVA_OPT% -server -Xms2g -Xmx2g -Xmn1g -XX:PermSize=128m -XX:MaxPermSize=320m" set "JAVA_OPT=%JAVA_OPT% -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:+DisableExplicitGC -XX:-UseParNewGC" -set "JAVA_OPT=%JAVA_OPT% -verbose:gc -Xloggc:"%HOMEPATH%\rmq_srv_gc.log" -XX:+PrintGCDetails" +set "JAVA_OPT=%JAVA_OPT% -verbose:gc -Xloggc:"%USERPROFILE%\rmq_srv_gc.log" -XX:+PrintGCDetails" set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow" set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages" set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs=%BASE_DIR%lib" set "JAVA_OPT=%JAVA_OPT% -cp "%CLASSPATH%"" -"%JAVA%" %JAVA_OPT% %* - -:end \ No newline at end of file +"%JAVA%" %JAVA_OPT% %* \ No newline at end of file diff --git a/bin/tools.cmd b/bin/tools.cmd index daf60864e64043f6d6467e03c2ef5b4a4b189389..28ce765326724a21f9c9019d0607a14df14b8a47 100644 --- a/bin/tools.cmd +++ b/bin/tools.cmd @@ -14,7 +14,7 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & goto end +if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! & EXIT /B 1 set "JAVA=%JAVA_HOME%\bin\java.exe" @@ -32,6 +32,4 @@ set "JAVA_OPT=%JAVA_OPT% -server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m -XX:Ma set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs="%BASE_DIR%\lib";"%JAVA_HOME%\jre\lib\ext"" set "JAVA_OPT=%JAVA_OPT% -cp "%CLASSPATH%"" -"%JAVA%" %JAVA_OPT% %* - -:end \ No newline at end of file +"%JAVA%" %JAVA_OPT% %* \ No newline at end of file