You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/09/03 18:44:13 UTC
cassandra git commit: Fix failure to start with space in directory
name on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 f7644f265 -> e1fc0e067
Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1fc0e06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1fc0e06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1fc0e06
Branch: refs/heads/cassandra-2.2
Commit: e1fc0e06719a9fd26030ace31e3742da196074d6
Parents: f7644f2
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 3 12:39:43 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 3 12:39:43 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra.bat | 2 +-
conf/cassandra-env.ps1 | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 91ae36c..fcb9ed7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.2
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
* Fix repair hang when snapshot failed (CASSANDRA-10057)
* Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/bin/cassandra.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6..0d207cd 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
-XX:CMSInitiatingOccupancyFraction=75^
-XX:+UseCMSInitiatingOccupancyOnly^
-Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
-Dcassandra.jmx.local.port=7199
REM **** JMX REMOTE ACCESS SETTINGS SEE: https://wiki.apache.org/cassandra/JmxSecurity ***
REM -Dcom.sun.management.jmxremote.port=7199^
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index fc0f6fd..9708964 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -199,7 +199,7 @@ Function CalculateHeapSizes
#-----------------------------------------------------------------------------
Function SetJsr223Env
{
- $cp = """$env:CLASSPATH"""
+ $cp = $env:CLASSPATH
foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
{
foreach ($file in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -332,7 +332,7 @@ Function SetCassandraEnvironment
ParseJVMInfo
# Add sigar env - see Cassandra-7838
- $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+ $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
# Confirm we're on high performance power plan, warn if not
# Change to $true to suppress this warning