Fix failure to start with space in directory name on Windows

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
This commit is contained in:
Joshua McKenzie 2015-09-03 12:39:43 -04:00
parent f7644f265a
commit e1fc0e0671
3 changed files with 4 additions and 3 deletions

View File

@ -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)

View File

@ -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^

View File

@ -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