mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-3.0' into cassandra-3.11
This commit is contained in:
commit
9dbebb0b6f
|
|
@ -9,6 +9,7 @@
|
|||
* Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
|
||||
* Avoid sending CDC column if not enabled (CASSANDRA-16770)
|
||||
Merged from 3.0:
|
||||
* Debian init respects CASSANDRA_HEAPDUMP_DIR (CASSANDRA-13843)
|
||||
* Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085)
|
||||
* Avoid removing batch when it's not created during view replication (CASSANDRA-16175)
|
||||
* Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564)
|
||||
|
|
|
|||
|
|
@ -73,7 +73,11 @@ do_start()
|
|||
ulimit -n "$FD_LIMIT"
|
||||
|
||||
cassandra_home=`getent passwd cassandra | awk -F ':' '{ print $6; }'`
|
||||
heap_dump_f="$cassandra_home/java_`date +%s`.hprof"
|
||||
if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then
|
||||
heap_dump_f="$CASSANDRA_HEAPDUMP_DIR/java_`date +%s`.hprof"
|
||||
else
|
||||
heap_dump_f="$cassandra_home/java_`date +%s`.hprof"
|
||||
fi
|
||||
error_log_f="$cassandra_home/hs_err_`date +%s`.log"
|
||||
|
||||
[ -e `dirname "$PIDFILE"` ] || \
|
||||
|
|
|
|||
Loading…
Reference in New Issue