natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Brandon Williams 2021-09-21 09:24:43 -05:00
parent 86aaf22f15 9dbebb0b6f
commit 053806c320
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -12,6 +12,9 @@ Merged from 3.11:
* Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
* Make assassinate more resilient to missing tokens (CASSANDRA-16847)
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)
4.0.1

6
debian/init vendored
View File

@ -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"` ] || \