Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9d6afb4b7 -> d6322a7ec refs/heads/trunk dee30cc63 -> 340ce90e9
fix heap size on Windows 32bit VM patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6322a7e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6322a7e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6322a7e Branch: refs/heads/cassandra-2.1 Commit: d6322a7ec2189c3e24854771917b9ae02090f41a Parents: 9d6afb4 Author: Jonathan Ellis <[email protected]> Authored: Wed Jun 18 14:01:04 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jun 18 14:01:04 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/cassandra.ps1 | 22 ++++++---------------- conf/cassandra-env.ps1 | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6322a7e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4c9e69d..8d81e3f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,7 +10,7 @@ * Don't fail streams on failure detector downs (CASSANDRA-3569) * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314) * Reduce run time for CQL tests (CASSANDRA-7327) - * Fix heap size calculation on Windows (CASSANDRA-7352) + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353) * RefCount native frames from netty (CASSANDRA-7245) * Use tarball dir instead of /var for default paths (CASSANDRA-7136) Merged from 2.0: @@ -29,6 +29,7 @@ Merged from 1.2: * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) * Fix RangeTombstone copy bug (CASSANDRA-7371) + 2.1.0-rc1 * Revert flush directory (CASSANDRA-6357) * More efficient executor service for fast operations (CASSANDRA-4718) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6322a7e/bin/cassandra.ps1 ---------------------------------------------------------------------- diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1 index b470b2c..98b5b27 100644 --- a/bin/cassandra.ps1 +++ b/bin/cassandra.ps1 @@ -249,18 +249,6 @@ $env:JAVA_BIN { $arg2 = $arg2 + " -Dcassandra-pidfile=$pidfile" } - echo @" -********************************************************************* -********************************************************************* -Warning! Running cassandra.bat -f on cygwin usually breaks control+c -functionality. You'll need to use: - stop-server.bat -p $pidfile -to stop your server or kill the java.exe instance. -********************************************************************* -*********************************************************************" -"@ - # Note: we can't pause here and force user confirmation for a similar reason as there's a - # layer of indirection between powershell and stdin. } $arg2 = $arg2 + " -Dcassandra-foreground=yes" @@ -294,14 +282,16 @@ WARNING! Failed to write pidfile to $pidfile. stop-server.bat and "@ } - $cassPid = $proc.Id - if (-Not ($proc) -or $cassPid -eq "") + Start-Sleep -m 100 + $checkProcess = Get-Process -Id $proc.Id -ErrorAction SilentlyContinue + if ($checkProcess -eq $null) { echo "Error starting cassandra." - echo "Run with -verbose for more information about runtime environment" + echo "Run with -v and -f to get foreground verbose information on the error." } - elseif ($foreground -eq "False") + else { + $cassPid = $proc.Id echo "Started cassandra successfully with pid: $cassPid" } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6322a7e/conf/cassandra-env.ps1 ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1 index e897ee9..efef415 100644 --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@ -206,7 +206,7 @@ Function SetCassandraEnvironment # times. If in doubt, and if you do not particularly want to tweak, go # 100 MB per physical CPU core. - #$env:MAX_HEAP_SIZE="4G" + #$env:MAX_HEAP_SIZE="4096M" #$env:HEAP_NEWSIZE="800M" CalculateHeapSizes
