From 83b3f1306140fec625c405fa263878eeefe1a728 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Fri, 25 Jul 2014 14:26:18 -0500
Subject: [PATCH] Set -Dcassandra.storagedir for all tool shell scripts

Patch by Tyler Hobbs; review by Joshua McKenzie for CASSANDRA-7587
---
 CHANGES.txt                  | 1 +
 bin/cassandra                | 3 ++-
 bin/cassandra-cli            | 1 +
 bin/cassandra-shuffle        | 1 +
 bin/cassandra.in.sh          | 4 ++++
 bin/nodetool                 | 1 +
 bin/sstablekeys              | 1 +
 bin/sstableloader            | 1 +
 bin/sstablescrub             | 1 +
 bin/sstableupgrade           | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh    | 4 ++++
 tools/bin/json2sstable       | 1 +
 tools/bin/sstable2json       | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata    | 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit       | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e0284be1b..d6dcfc9a70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
    v2 protocols (CASSANDRA-7617)
  * Fix tracing of range slices and secondary index lookups that are local
    to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)
diff --git a/bin/cassandra b/bin/cassandra
index 47c6c88698..53a529e97a 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -134,7 +134,8 @@ launch_service()
     props="$3"
     class="$4"
     cassandra_parms="-Dlogback.configurationFile=logback.xml"
-    cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs -Dcassandra.storagedir=$CASSANDRA_HOME/data"
+    cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
+    cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
 
     if [ "x$pidpath" != "x" ]; then
         cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath"
diff --git a/bin/cassandra-cli b/bin/cassandra-cli
index 80069d491f..a2696da83d 100755
--- a/bin/cassandra-cli
+++ b/bin/cassandra-cli
@@ -44,6 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" -ea -cp "$CLASSPATH" -Xmx256M \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.cli.CliMain "$@"
 
diff --git a/bin/cassandra-shuffle b/bin/cassandra-shuffle
index 31975d4dfd..10a409d8bc 100755
--- a/bin/cassandra-shuffle
+++ b/bin/cassandra-shuffle
@@ -51,6 +51,7 @@ esac
 
 "$JAVA" -cp "$CLASSPATH" \
       -Xmx32m \
+      -Dcassandra.storagedir="$cassandra_storagedir" \
       -Dlogback.configurationFile=logback-tools.xml \
       org.apache.cassandra.tools.Shuffle $@
 
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 1212418114..50e6eafc0e 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -30,6 +30,10 @@ cassandra_bin="$CASSANDRA_HOME/build/classes/main"
 cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 #cassandra_bin="$cassandra_home/build/cassandra.jar"
 
+# the default location for commitlogs, sstables, and saved caches
+# if not set in cassandra.yaml
+cassandra_storagedir="$CASSANDRA_HOME/data"
+
 # JAVA_HOME can optionally be set here
 #JAVA_HOME=/usr/local/jdk6
 
diff --git a/bin/nodetool b/bin/nodetool
index 36a7016cf8..9c6b7bd374 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -88,6 +88,7 @@ esac
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" \
       -Xmx32m \
+      -Dcassandra.storagedir="$cassandra_storagedir" \
       -Dlogback.configurationFile=logback-tools.xml \
       -Dstorage-config="$CASSANDRA_CONF" \
       org.apache.cassandra.tools.NodeTool -p $JMX_PORT $ARGS
diff --git a/bin/sstablekeys b/bin/sstablekeys
index 34f3d1be84..8308b88ac6 100755
--- a/bin/sstablekeys
+++ b/bin/sstablekeys
@@ -49,6 +49,7 @@ if [ $# -eq "0" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableExport "$@" -e
 
diff --git a/bin/sstableloader b/bin/sstableloader
index cd4598eb86..2ee4f51e01 100755
--- a/bin/sstableloader
+++ b/bin/sstableloader
@@ -44,6 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx256M \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.BulkLoader "$@"
 
diff --git a/bin/sstablescrub b/bin/sstablescrub
index 3b7ca6c726..a5f9a675dc 100755
--- a/bin/sstablescrub
+++ b/bin/sstablescrub
@@ -48,6 +48,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx$MAX_HEAP_SIZE \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.StandaloneScrubber "$@"
 
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index bca52c3864..6248ac8a97 100755
--- a/bin/sstableupgrade
+++ b/bin/sstableupgrade
@@ -48,6 +48,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
 fi
 
 $JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.StandaloneUpgrader "$@"
 
diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress
index c855cf596f..53440ac11b 100755
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@@ -42,4 +42,6 @@ if [ "x$JAVA" = "x" ]; then
     exit 1
 fi
 
-$JAVA -server -ea -cp $CLASSPATH org.apache.cassandra.stress.Stress $@
+$JAVA -server -ea -cp "$CLASSPATH" \
+      -Dcassandra.storagedir="$cassandra_storagedir" \
+      org.apache.cassandra.stress.Stress $@
diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd
index 9110c5d957..6532707ffd 100755
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@@ -52,7 +52,9 @@ fi
 case "$1" in
   start)
     echo "Starting $DESC: "
-    $JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
+    $JAVA -server -cp $CLASSPATH \
+          -Dcassandra.storagedir="$cassandra_storagedir" \
+          org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
     echo $! > ./stressd.pid
     echo "done."
   ;;
diff --git a/tools/bin/cassandra.in.sh b/tools/bin/cassandra.in.sh
index 4b81514d94..004f394f8c 100644
--- a/tools/bin/cassandra.in.sh
+++ b/tools/bin/cassandra.in.sh
@@ -31,6 +31,10 @@ cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/stress"
 cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 #cassandra_bin="$cassandra_home/build/cassandra.jar"
 
+# the default location for commitlogs, sstables, and saved caches
+# if not set in cassandra.yaml
+cassandra_storagedir="$CASSANDRA_HOME/data"
+
 # JAVA_HOME can optionally be set here
 #JAVA_HOME=/usr/local/jdk6
 
diff --git a/tools/bin/json2sstable b/tools/bin/json2sstable
index fff559f307..bb10b5123c 100755
--- a/tools/bin/json2sstable
+++ b/tools/bin/json2sstable
@@ -44,6 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableImport "$@"
 
diff --git a/tools/bin/sstable2json b/tools/bin/sstable2json
index bcd346cd8b..a7882bf615 100755
--- a/tools/bin/sstable2json
+++ b/tools/bin/sstable2json
@@ -45,6 +45,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableExport "$@"
 
diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset
index f6b3b1ed09..497d6048a2 100755
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@@ -45,5 +45,6 @@ if [ -z $CLASSPATH ]; then
 fi
 
 $JAVA -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableLevelResetter "$@"
diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata
index d9d8d6f081..f7ce14131a 100755
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@@ -42,5 +42,6 @@ else
 fi
 
 $JAVA -cp $CLASSPATH \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableMetadataViewer "$@"
diff --git a/tools/bin/sstablerepairedset b/tools/bin/sstablerepairedset
index 73201ad7b5..1aa30a3ee4 100755
--- a/tools/bin/sstablerepairedset
+++ b/tools/bin/sstablerepairedset
@@ -42,5 +42,6 @@ else
 fi
 
 $JAVA -cp $CLASSPATH \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableRepairedAtSetter "$@"
diff --git a/tools/bin/sstablesplit b/tools/bin/sstablesplit
index 13a81ef617..73e736e662 100755
--- a/tools/bin/sstablesplit
+++ b/tools/bin/sstablesplit
@@ -44,6 +44,7 @@ if [ -z $CLASSPATH ]; then
 fi
 
 $JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx256M \
+        -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.StandaloneSplitter "$@"