Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 9bf513374 -> b9b2a4e1a
  refs/heads/cassandra-3.11 14bfc9493 -> 443088fd1
  refs/heads/trunk a6bf9c535 -> 4f1094e66


Cassandra not starting when using enhanced startup scripts in windows

patch by Shyam Phirke; reviewed by jasobrown CASSANDRA-14418


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

Branch: refs/heads/cassandra-3.0
Commit: b9b2a4e1a07af518cebd4441469c940d5ac0c2ea
Parents: 9bf5133
Author: Shyam Phirke <shyam_phi...@bmc.com>
Authored: Sat May 12 05:28:20 2018 -0700
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Sat May 12 05:28:20 2018 -0700

----------------------------------------------------------------------
 CHANGES.txt            | 1 +
 conf/cassandra-env.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9b2a4e1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e2f6d07..7c557f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
  * Fix progress stats and units in compactionstats (CASSANDRA-12244)
  * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
  * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9b2a4e1/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 405ed92..74511f0 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -377,7 +377,7 @@ Function SetCassandraEnvironment
     }
 
     # provides hints to the JIT compiler
-    $env:JVM_OPTS = "$env:JVM_OPTS 
-XX:CompileCommandFile=$env:CASSANDRA_CONF\hotspot_compiler"
+    $env:JVM_OPTS = "$env:JVM_OPTS 
-XX:CompileCommandFile=""$env:CASSANDRA_CONF\hotspot_compiler"""
 
     # add the jamm javaagent
     if (($env:JVM_VENDOR -ne "OpenJDK") -or 
($env:JVM_VERSION.CompareTo("1.6.0") -eq 1) -or
@@ -390,7 +390,7 @@ Function SetCassandraEnvironment
     if ($env:CASSANDRA_HEAPDUMP_DIR)
     {
         $unixTimestamp = [int64](([datetime]::UtcNow)-(get-date 
"1/1/1970")).TotalSeconds
-        $env:JVM_OPTS="$env:JVM_OPTS 
-XX:HeapDumpPath=$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof"
+        $env:JVM_OPTS="$env:JVM_OPTS 
-XX:HeapDumpPath=""$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof"""
     }
 
     if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or 
[convert]::ToInt32($env:JVM_PATCH_VERSION) -lt 40)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to