Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/443088fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/443088fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/443088fd Branch: refs/heads/trunk Commit: 443088fd13ce8ad71fa96389095bfb117f65c6bd Parents: 14bfc94 b9b2a4e Author: Jason Brown <jasedbr...@gmail.com> Authored: Sat May 12 05:29:20 2018 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sat May 12 05:31:34 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/443088fd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fc643ad,7c557f7..3e8f687 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -3.0.17 +3.11.3 + * Update metrics to 3.1.5 (CASSANDRA-12924) + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) + * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370) + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418) * Fix progress stats and units in compactionstats (CASSANDRA-12244) * Better handle missing partition columns in system_schema.columns (CASSANDRA-14379) * Delay hints store excise by write timeout to avoid race with decommission (CASSANDRA-13740) http://git-wip-us.apache.org/repos/asf/cassandra/blob/443088fd/conf/cassandra-env.ps1 ---------------------------------------------------------------------- diff --cc conf/cassandra-env.ps1 index 49d03ce,74511f0..c78a3fc --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@@ -390,9 -390,36 +390,9 @@@ Function SetCassandraEnvironmen if ($env:CASSANDRA_HEAPDUMP_DIR) { $unixTimestamp = [int64](([datetime]::UtcNow)-(get-date "1/1/1970")).TotalSeconds - $env:JVM_OPTS="$env:JVM_OPTS -XX:HeapDumpPath=$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof" + $env:JVM_OPTS="$env:JVM_OPTS -XX:HeapDumpPath=""$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof""" } - if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or [convert]::ToInt32($env:JVM_PATCH_VERSION) -lt 40) - { - echo "Cassandra 3.0 and later require Java 8u40 or later." - exit - } - - # enable assertions. disabling this in production will give a modest - # performance benefit (around 5%). - $env:JVM_OPTS = "$env:JVM_OPTS -ea" - - # Specifies the default port over which Cassandra will be available for - # JMX connections. - $JMX_PORT="7199" - - # store in env to check if it's avail in verification - $env:JMX_PORT=$JMX_PORT - - # enable thread priorities, primarily so we can give periodic tasks - # a lower priority to avoid interfering with client workload - $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseThreadPriorities" - # allows lowering thread priority without being root on linux - probably - # not necessary on Windows but doesn't harm anything. - # see http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workar - $env:JVM_OPTS="$env:JVM_OPTS -XX:ThreadPriorityPolicy=42" - - $env:JVM_OPTS="$env:JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" - # stop the jvm on OutOfMemoryError as it can result in some data corruption # uncomment the preferred option # ExitOnOutOfMemoryError and CrashOnOutOfMemoryError require a JRE greater or equals to 1.7 update 101 or 1.8 update 92 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
