cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [18/22] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 30 Jun 2016 17:37:39 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1991fea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1991fea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1991fea8

Branch: refs/heads/cassandra-3.9
Commit: 1991fea8bf5b8eb51c32cf1f322fab0a97c81299
Parents: 4f14bc5 3041034
Author: Josh McKenzie <jmckenzie@apache.org>
Authored: Thu Jun 30 13:36:07 2016 -0400
Committer: Josh McKenzie <jmckenzie@apache.org>
Committed: Thu Jun 30 13:36:17 2016 -0400

----------------------------------------------------------------------
 conf/cassandra-env.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1991fea8/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --cc conf/cassandra-env.ps1
index 80645f9,8d4c254..c7ed51f
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -327,26 -326,6 +327,26 @@@ Function SetCassandraEnvironmen
      # times. If in doubt, and if you do not particularly want to tweak, go
      # 100 MB per physical CPU core.
  
-     New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
++    New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
 +    #GC log path has to be defined here since it needs to find CASSANDRA_HOME
 +    $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
 +
 +    # Read user-defined JVM options from jvm.options file
 +    $content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
 +    for ($i = 0; $i -lt $content.Count; $i++)
 +    {
 +        $line = $content[$i]
 +        if ($line.StartsWith("-"))
 +        {
 +            $env:JVM_OPTS = "$env:JVM_OPTS $line"
 +        }
 +    }
 +
 +    $defined_xmn = $env:JVM_OPTS -like '*Xmn*'
 +    $defined_xmx = $env:JVM_OPTS -like '*Xmx*'
 +    $defined_xms = $env:JVM_OPTS -like '*Xms*'
 +    $using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*'
 +
      #$env:MAX_HEAP_SIZE="4096M"
      #$env:HEAP_NEWSIZE="800M"
      CalculateHeapSizes


Mime
View raw message