Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 f77936d80 -> 85e402a7f refs/heads/trunk f3609995c -> f54ac59ac
Make stop-server.bat wait for Cassandra to terminate patch by Georg Dietrich; reviewed by Dinesh Joshi for CASSANDRA-14829 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85e402a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85e402a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85e402a7 Branch: refs/heads/cassandra-3.11 Commit: 85e402a7fda59110aeea181924035d69db693240 Parents: f77936d Author: Georg Dietrich <gd...@users.noreply.github.com> Authored: Mon Dec 3 05:12:49 2018 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Mon Dec 3 05:12:49 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/stop-server.bat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85e402a7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b853ab0..8d184c6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.4 + * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829) * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870) Merged from 3.0: * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909) http://git-wip-us.apache.org/repos/asf/cassandra/blob/85e402a7/bin/stop-server.bat ---------------------------------------------------------------------- diff --git a/bin/stop-server.bat b/bin/stop-server.bat index 66a55fd..acd88d0 100644 --- a/bin/stop-server.bat +++ b/bin/stop-server.bat @@ -38,7 +38,7 @@ FOR /F "tokens=2 delims= " %%A IN ('TASKLIST /FI ^"WINDOWTITLE eq %rand%^" /NH') REM Start with /B -> the control+c event we generate in stop-server.ps1 percolates REM up and hits this external batch file if we call powershell directly. -start /B powershell /file "%CASSANDRA_HOME%/bin/stop-server.ps1" -batchpid %PID% %* +start /WAIT /B powershell /file "%CASSANDRA_HOME%/bin/stop-server.ps1" -batchpid %PID% %* goto finally REM ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org