You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/05 18:03:00 UTC
[01/19] cassandra git commit: Add check if existing fat client entry
in gossip has same broadcast address in checkForEndpointCollision to enable
quicker bootstrap retries.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 3a0be2540 -> c04bf2a9b
refs/heads/cassandra-3.0 a4e3f0847 -> 3e45fa1ab
refs/heads/cassandra-3.3 ea4f64977 -> bd2785e9c
refs/heads/trunk 63ffe83f3 -> 650d76d71
Add check if existing fat client entry in gossip has same broadcast address in checkForEndpointCollision to enable quicker bootstrap retries.
patch by jkni; reviewed by Stefania for CASSANDRA-10844
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b551b8e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b551b8e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b551b8e1
Branch: refs/heads/cassandra-3.0
Commit: b551b8e1e6ac37698b78e4ee65a658bd446e7f05
Parents: a55fd76
Author: Joel Knighton <jo...@datastax.com>
Authored: Thu Dec 31 10:27:25 2015 -0600
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:31:17 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b551b8e1/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 0698d11..6e38b92 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -550,7 +550,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (Map.Entry<InetAddress, EndpointState> entry : Gossiper.instance.getEndpointStates())
{
- if (entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
+ if (entry.getKey().equals(FBUtilities.getBroadcastAddress()) || entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
continue;
String[] pieces = entry.getValue().getApplicationState(ApplicationState.STATUS).value.split(VersionedValue.DELIMITER_STR, -1);
assert (pieces.length > 0);
[10/19] cassandra git commit: Enable GC logging by default
Posted by sl...@apache.org.
Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c04bf2a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04bf2a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04bf2a9
Branch: refs/heads/cassandra-3.3
Commit: c04bf2a9bb8bc48bcdf49455478836e6fd1f217d
Parents: 3a0be25
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:32:18 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:49:42 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 27 ++++++++++-----------
conf/cassandra-env.sh | 28 +++++++++++-----------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++---
5 files changed, 45 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 648200b..d5bb7a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Enable GC logging by default
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3876c43..57e321e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -33,6 +33,8 @@ Operations
"rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
-Dcassandra.ignore_dc=true.
- Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
+ - GC logging is now enabled by default (but you can disable it if you want by
+ commenting the relevant lines of the cassandra-env file).
New features
------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 9708964..aff0d9e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -416,24 +416,23 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
}
- # GC logging options -- uncomment to enable
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
+ # GC logging options
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
+
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
+ # if using version before JDK 6u34 or 7u2 use this instead of log rotation
# $currentDate = (Get-Date).ToString('yyyy.MM.dd')
# $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc-$currentDate.log"
- # If you are using JDK 6u34 7u2 or later you can enable GC log rotation
- # don't stick the date in the log name if rotation is on.
- # $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
-
# Configure the following for JEMallocAllocator and if jemalloc is not available in the system
# library path.
# set LD_LIBRARY_PATH=<JEMALLOC_HOME>/lib/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e82198b..ea1a736 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -232,21 +232,21 @@ if [ "$JVM_ARCH" = "64-Bit" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
fi
-# GC logging options -- uncomment to enable
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
-# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+# GC logging options
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
+JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
+JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+#JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
+# if using version before JDK 6u34 or 7u2 use this instead of log rotation
# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log"
-# If you are using JDK 6u34 7u2 or later you can enable GC log rotation
-# don't stick the date in the log name if rotation is on.
-# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
-# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
-# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
-# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
# JVM_OPTS="$JVM_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1414"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..cca337c 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:15:10.718076265 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:23:10.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:20:22.990840135 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:24:03.210202234 -0500
+@@ -288,7 +288,7 @@
+ JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+ #JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+ JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+ JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
[11/19] cassandra git commit: Merge commit
'c04bf2a9bb8bc48bcdf49455478836e6fd1f217d' into cassandra-3.0
Posted by sl...@apache.org.
Merge commit 'c04bf2a9bb8bc48bcdf49455478836e6fd1f217d' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fd0c15b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fd0c15b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fd0c15b
Branch: refs/heads/cassandra-3.0
Commit: 2fd0c15b272dd15506ecadaf90d8c9c5c2cc9534
Parents: a4e3f08 c04bf2a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 17:57:06 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:57:06 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[18/19] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd2785e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd2785e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd2785e9
Branch: refs/heads/cassandra-3.3
Commit: bd2785e9c25249fcbbd1cb398aee4e4069ba6763
Parents: ea4f649 3e45fa1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 18:02:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:02:13 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 3 +++
conf/cassandra-env.sh | 5 ++++-
conf/jvm.options | 18 +++++++++---------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/cassandra-env.ps1
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/cassandra-env.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/jvm.options
----------------------------------------------------------------------
[09/19] cassandra git commit: Enable GC logging by default
Posted by sl...@apache.org.
Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c04bf2a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04bf2a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04bf2a9
Branch: refs/heads/cassandra-3.0
Commit: c04bf2a9bb8bc48bcdf49455478836e6fd1f217d
Parents: 3a0be25
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:32:18 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:49:42 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 27 ++++++++++-----------
conf/cassandra-env.sh | 28 +++++++++++-----------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++---
5 files changed, 45 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 648200b..d5bb7a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Enable GC logging by default
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3876c43..57e321e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -33,6 +33,8 @@ Operations
"rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
-Dcassandra.ignore_dc=true.
- Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
+ - GC logging is now enabled by default (but you can disable it if you want by
+ commenting the relevant lines of the cassandra-env file).
New features
------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 9708964..aff0d9e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -416,24 +416,23 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
}
- # GC logging options -- uncomment to enable
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
+ # GC logging options
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
+
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
+ # if using version before JDK 6u34 or 7u2 use this instead of log rotation
# $currentDate = (Get-Date).ToString('yyyy.MM.dd')
# $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc-$currentDate.log"
- # If you are using JDK 6u34 7u2 or later you can enable GC log rotation
- # don't stick the date in the log name if rotation is on.
- # $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
-
# Configure the following for JEMallocAllocator and if jemalloc is not available in the system
# library path.
# set LD_LIBRARY_PATH=<JEMALLOC_HOME>/lib/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e82198b..ea1a736 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -232,21 +232,21 @@ if [ "$JVM_ARCH" = "64-Bit" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
fi
-# GC logging options -- uncomment to enable
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
-# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+# GC logging options
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
+JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
+JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+#JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
+# if using version before JDK 6u34 or 7u2 use this instead of log rotation
# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log"
-# If you are using JDK 6u34 7u2 or later you can enable GC log rotation
-# don't stick the date in the log name if rotation is on.
-# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
-# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
-# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
-# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
# JVM_OPTS="$JVM_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1414"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..cca337c 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:15:10.718076265 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:23:10.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:20:22.990840135 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:24:03.210202234 -0500
+@@ -288,7 +288,7 @@
+ JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+ #JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+ JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+ JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
[17/19] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd2785e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd2785e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd2785e9
Branch: refs/heads/trunk
Commit: bd2785e9c25249fcbbd1cb398aee4e4069ba6763
Parents: ea4f649 3e45fa1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 18:02:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:02:13 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 3 +++
conf/cassandra-env.sh | 5 ++++-
conf/jvm.options | 18 +++++++++---------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/cassandra-env.ps1
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/cassandra-env.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/jvm.options
----------------------------------------------------------------------
[12/19] cassandra git commit: Merge commit
'c04bf2a9bb8bc48bcdf49455478836e6fd1f217d' into cassandra-3.0
Posted by sl...@apache.org.
Merge commit 'c04bf2a9bb8bc48bcdf49455478836e6fd1f217d' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fd0c15b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fd0c15b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fd0c15b
Branch: refs/heads/trunk
Commit: 2fd0c15b272dd15506ecadaf90d8c9c5c2cc9534
Parents: a4e3f08 c04bf2a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 17:57:06 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:57:06 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/19] cassandra git commit: Merge commit
'c04bf2a9bb8bc48bcdf49455478836e6fd1f217d' into cassandra-3.0
Posted by sl...@apache.org.
Merge commit 'c04bf2a9bb8bc48bcdf49455478836e6fd1f217d' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fd0c15b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fd0c15b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fd0c15b
Branch: refs/heads/cassandra-3.3
Commit: 2fd0c15b272dd15506ecadaf90d8c9c5c2cc9534
Parents: a4e3f08 c04bf2a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 17:57:06 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:57:06 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/19] cassandra git commit: Merge commit
'b551b8e1e6ac37698b78e4ee65a658bd446e7f05' into cassandra-2.2
Posted by sl...@apache.org.
Merge commit 'b551b8e1e6ac37698b78e4ee65a658bd446e7f05' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a0be254
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a0be254
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a0be254
Branch: refs/heads/cassandra-3.0
Commit: 3a0be2540b14800bfc193fb5ab226e4463a73ccb
Parents: e0c1b0b b551b8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:34:23 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:34:23 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[19/19] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/650d76d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/650d76d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/650d76d7
Branch: refs/heads/trunk
Commit: 650d76d7193a5840aa373a6caf9639a57ecf87f7
Parents: 63ffe83 bd2785e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 18:02:34 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:02:34 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 3 +++
conf/cassandra-env.sh | 5 ++++-
conf/jvm.options | 18 +++++++++---------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[15/19] cassandra git commit: Enable GC logging by default (3.0
version)
Posted by sl...@apache.org.
Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e45fa1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e45fa1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e45fa1a
Branch: refs/heads/cassandra-3.0
Commit: 3e45fa1ab521bd50eb247f58daa2bfa76c6ab4e5
Parents: 2fd0c15
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:33:26 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:01:29 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 3 +++
conf/cassandra-env.sh | 5 ++++-
conf/jvm.options | 18 +++++++++---------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b5610e..103ae05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
* Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
Merged from 2.2:
+ * Enable GC logging by default (CASSANDRA-10140)
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 8a03e14..26a83a9 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -32,6 +32,8 @@ Upgrading
- Custom index implementation should be aware that the method Indexer::indexes()
has been removed as its contract was misleading and all custom implementation
should have almost surely returned true inconditionally for that method.
+ - GC logging is now enabled by default (you can disable it in the jvm.options
+ file if you prefer).
3.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index a38429e..5eefb04 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -333,6 +333,9 @@ Function SetCassandraEnvironment
ParseJVMInfo
+ #GC log path has to be defined here since it needs to find CASSANDRA_HOME
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+
# Read user-defined JVM options from jvm.options file
$content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
for ($i = 0; $i -lt $content.Count; $i++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index ef164e8..f322803 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -33,7 +33,7 @@ calculate_heap_sizes()
Darwin)
system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'`
system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024`
- system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'`
+
;;
*)
# assume reasonable defaults for e.g. a modern desktop or
@@ -156,6 +156,9 @@ if [ "x$MALLOC_ARENA_MAX" = "x" ] ; then
export MALLOC_ARENA_MAX=4
fi
+#GC log path has to be defined here because it needs to access CASSANDRA_HOME
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+
# Here we create the arguments that will get passed to the jvm when
# starting cassandra.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/jvm.options
----------------------------------------------------------------------
diff --git a/conf/jvm.options b/conf/jvm.options
index c5d3d95..a7b3bd8 100644
--- a/conf/jvm.options
+++ b/conf/jvm.options
@@ -95,14 +95,14 @@
### GC logging options -- uncomment to enable
-#-XX:+PrintGCDetails
-#-XX:+PrintGCDateStamps
-#-XX:+PrintHeapAtGC
-#-XX:+PrintTenuringDistribution
-#-XX:+PrintGCApplicationStoppedTime
-#-XX:+PrintPromotionFailure
+-XX:+PrintGCDetails
+-XX:+PrintGCDateStamps
+-XX:+PrintHeapAtGC
+-XX:+PrintTenuringDistribution
+-XX:+PrintGCApplicationStoppedTime
+-XX:+PrintPromotionFailure
#-XX:PrintFLSStatistics=1
#-Xloggc:/var/log/cassandra/gc.log
-#-XX:+UseGCLogFileRotation
-#-XX:NumberOfGCLogFiles=10
-#-XX:GCLogFileSize=10M
+-XX:+UseGCLogFileRotation
+-XX:NumberOfGCLogFiles=10
+-XX:GCLogFileSize=10M
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..87387b9 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:35:22.000000000 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:41:38.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:40:39.000000000 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:42:40.647449856 -0500
+@@ -204,7 +204,7 @@
+ esac
+
+ #GC log path has to be defined here because it needs to access CASSANDRA_HOME
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+
+ # Here we create the arguments that will get passed to the jvm when
+ # starting cassandra.
[06/19] cassandra git commit: Merge commit
'b551b8e1e6ac37698b78e4ee65a658bd446e7f05' into cassandra-2.2
Posted by sl...@apache.org.
Merge commit 'b551b8e1e6ac37698b78e4ee65a658bd446e7f05' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a0be254
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a0be254
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a0be254
Branch: refs/heads/trunk
Commit: 3a0be2540b14800bfc193fb5ab226e4463a73ccb
Parents: e0c1b0b b551b8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:34:23 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:34:23 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/19] cassandra git commit: Add check if existing fat client entry
in gossip has same broadcast address in checkForEndpointCollision to enable
quicker bootstrap retries.
Posted by sl...@apache.org.
Add check if existing fat client entry in gossip has same broadcast address in checkForEndpointCollision to enable quicker bootstrap retries.
patch by jkni; reviewed by Stefania for CASSANDRA-10844
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b551b8e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b551b8e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b551b8e1
Branch: refs/heads/cassandra-3.3
Commit: b551b8e1e6ac37698b78e4ee65a658bd446e7f05
Parents: a55fd76
Author: Joel Knighton <jo...@datastax.com>
Authored: Thu Dec 31 10:27:25 2015 -0600
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:31:17 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b551b8e1/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 0698d11..6e38b92 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -550,7 +550,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (Map.Entry<InetAddress, EndpointState> entry : Gossiper.instance.getEndpointStates())
{
- if (entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
+ if (entry.getKey().equals(FBUtilities.getBroadcastAddress()) || entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
continue;
String[] pieces = entry.getValue().getApplicationState(ApplicationState.STATUS).value.split(VersionedValue.DELIMITER_STR, -1);
assert (pieces.length > 0);
[08/19] cassandra git commit: Enable GC logging by default
Posted by sl...@apache.org.
Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c04bf2a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04bf2a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04bf2a9
Branch: refs/heads/cassandra-2.2
Commit: c04bf2a9bb8bc48bcdf49455478836e6fd1f217d
Parents: 3a0be25
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:32:18 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:49:42 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 27 ++++++++++-----------
conf/cassandra-env.sh | 28 +++++++++++-----------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++---
5 files changed, 45 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 648200b..d5bb7a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Enable GC logging by default
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3876c43..57e321e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -33,6 +33,8 @@ Operations
"rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
-Dcassandra.ignore_dc=true.
- Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
+ - GC logging is now enabled by default (but you can disable it if you want by
+ commenting the relevant lines of the cassandra-env file).
New features
------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 9708964..aff0d9e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -416,24 +416,23 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
}
- # GC logging options -- uncomment to enable
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
+ # GC logging options
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
+
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
+ # if using version before JDK 6u34 or 7u2 use this instead of log rotation
# $currentDate = (Get-Date).ToString('yyyy.MM.dd')
# $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc-$currentDate.log"
- # If you are using JDK 6u34 7u2 or later you can enable GC log rotation
- # don't stick the date in the log name if rotation is on.
- # $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
-
# Configure the following for JEMallocAllocator and if jemalloc is not available in the system
# library path.
# set LD_LIBRARY_PATH=<JEMALLOC_HOME>/lib/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e82198b..ea1a736 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -232,21 +232,21 @@ if [ "$JVM_ARCH" = "64-Bit" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
fi
-# GC logging options -- uncomment to enable
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
-# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+# GC logging options
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
+JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
+JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+#JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
+# if using version before JDK 6u34 or 7u2 use this instead of log rotation
# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log"
-# If you are using JDK 6u34 7u2 or later you can enable GC log rotation
-# don't stick the date in the log name if rotation is on.
-# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
-# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
-# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
-# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
# JVM_OPTS="$JVM_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1414"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..cca337c 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:15:10.718076265 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:23:10.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:20:22.990840135 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:24:03.210202234 -0500
+@@ -288,7 +288,7 @@
+ JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+ #JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+ JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+ JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
[03/19] cassandra git commit: Add check if existing fat client entry
in gossip has same broadcast address in checkForEndpointCollision to enable
quicker bootstrap retries.
Posted by sl...@apache.org.
Add check if existing fat client entry in gossip has same broadcast address in checkForEndpointCollision to enable quicker bootstrap retries.
patch by jkni; reviewed by Stefania for CASSANDRA-10844
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b551b8e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b551b8e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b551b8e1
Branch: refs/heads/trunk
Commit: b551b8e1e6ac37698b78e4ee65a658bd446e7f05
Parents: a55fd76
Author: Joel Knighton <jo...@datastax.com>
Authored: Thu Dec 31 10:27:25 2015 -0600
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:31:17 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b551b8e1/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 0698d11..6e38b92 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -550,7 +550,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (Map.Entry<InetAddress, EndpointState> entry : Gossiper.instance.getEndpointStates())
{
- if (entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
+ if (entry.getKey().equals(FBUtilities.getBroadcastAddress()) || entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
continue;
String[] pieces = entry.getValue().getApplicationState(ApplicationState.STATUS).value.split(VersionedValue.DELIMITER_STR, -1);
assert (pieces.length > 0);
[07/19] cassandra git commit: Enable GC logging by default
Posted by sl...@apache.org.
Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c04bf2a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04bf2a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04bf2a9
Branch: refs/heads/trunk
Commit: c04bf2a9bb8bc48bcdf49455478836e6fd1f217d
Parents: 3a0be25
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:32:18 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 17:49:42 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 27 ++++++++++-----------
conf/cassandra-env.sh | 28 +++++++++++-----------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++---
5 files changed, 45 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 648200b..d5bb7a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Enable GC logging by default
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3876c43..57e321e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -33,6 +33,8 @@ Operations
"rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
-Dcassandra.ignore_dc=true.
- Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
+ - GC logging is now enabled by default (but you can disable it if you want by
+ commenting the relevant lines of the cassandra-env file).
New features
------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 9708964..aff0d9e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -416,24 +416,23 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
}
- # GC logging options -- uncomment to enable
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
+ # GC logging options
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDateStamps"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintHeapAtGC"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintTenuringDistribution"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
+
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
+ # if using version before JDK 6u34 or 7u2 use this instead of log rotation
# $currentDate = (Get-Date).ToString('yyyy.MM.dd')
# $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc-$currentDate.log"
- # If you are using JDK 6u34 7u2 or later you can enable GC log rotation
- # don't stick the date in the log name if rotation is on.
- # $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
- # $env:JVM_OPTS="$env:JVM_OPTS -XX:GCLogFileSize=10M"
-
# Configure the following for JEMallocAllocator and if jemalloc is not available in the system
# library path.
# set LD_LIBRARY_PATH=<JEMALLOC_HOME>/lib/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e82198b..ea1a736 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -232,21 +232,21 @@ if [ "$JVM_ARCH" = "64-Bit" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
fi
-# GC logging options -- uncomment to enable
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
-# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
-# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+# GC logging options
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps"
+JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC"
+JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution"
+JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime"
+JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+#JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
+# if using version before JDK 6u34 or 7u2 use this instead of log rotation
# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log"
-# If you are using JDK 6u34 7u2 or later you can enable GC log rotation
-# don't stick the date in the log name if rotation is on.
-# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
-# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
-# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
-# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
# JVM_OPTS="$JVM_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1414"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c04bf2a9/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..cca337c 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:15:10.718076265 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:23:10.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:20:22.990840135 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:24:03.210202234 -0500
+@@ -288,7 +288,7 @@
+ JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
+ #JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+ JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
+ JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
[05/19] cassandra git commit: Merge commit
'b551b8e1e6ac37698b78e4ee65a658bd446e7f05' into cassandra-2.2
Posted by sl...@apache.org.
Merge commit 'b551b8e1e6ac37698b78e4ee65a658bd446e7f05' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a0be254
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a0be254
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a0be254
Branch: refs/heads/cassandra-3.3
Commit: 3a0be2540b14800bfc193fb5ab226e4463a73ccb
Parents: e0c1b0b b551b8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:34:23 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:34:23 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/19] cassandra git commit: Enable GC logging by default (3.0
version)
Posted by sl...@apache.org.
Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e45fa1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e45fa1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e45fa1a
Branch: refs/heads/trunk
Commit: 3e45fa1ab521bd50eb247f58daa2bfa76c6ab4e5
Parents: 2fd0c15
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:33:26 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:01:29 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 3 +++
conf/cassandra-env.sh | 5 ++++-
conf/jvm.options | 18 +++++++++---------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b5610e..103ae05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
* Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
Merged from 2.2:
+ * Enable GC logging by default (CASSANDRA-10140)
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 8a03e14..26a83a9 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -32,6 +32,8 @@ Upgrading
- Custom index implementation should be aware that the method Indexer::indexes()
has been removed as its contract was misleading and all custom implementation
should have almost surely returned true inconditionally for that method.
+ - GC logging is now enabled by default (you can disable it in the jvm.options
+ file if you prefer).
3.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index a38429e..5eefb04 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -333,6 +333,9 @@ Function SetCassandraEnvironment
ParseJVMInfo
+ #GC log path has to be defined here since it needs to find CASSANDRA_HOME
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+
# Read user-defined JVM options from jvm.options file
$content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
for ($i = 0; $i -lt $content.Count; $i++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index ef164e8..f322803 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -33,7 +33,7 @@ calculate_heap_sizes()
Darwin)
system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'`
system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024`
- system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'`
+
;;
*)
# assume reasonable defaults for e.g. a modern desktop or
@@ -156,6 +156,9 @@ if [ "x$MALLOC_ARENA_MAX" = "x" ] ; then
export MALLOC_ARENA_MAX=4
fi
+#GC log path has to be defined here because it needs to access CASSANDRA_HOME
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+
# Here we create the arguments that will get passed to the jvm when
# starting cassandra.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/jvm.options
----------------------------------------------------------------------
diff --git a/conf/jvm.options b/conf/jvm.options
index c5d3d95..a7b3bd8 100644
--- a/conf/jvm.options
+++ b/conf/jvm.options
@@ -95,14 +95,14 @@
### GC logging options -- uncomment to enable
-#-XX:+PrintGCDetails
-#-XX:+PrintGCDateStamps
-#-XX:+PrintHeapAtGC
-#-XX:+PrintTenuringDistribution
-#-XX:+PrintGCApplicationStoppedTime
-#-XX:+PrintPromotionFailure
+-XX:+PrintGCDetails
+-XX:+PrintGCDateStamps
+-XX:+PrintHeapAtGC
+-XX:+PrintTenuringDistribution
+-XX:+PrintGCApplicationStoppedTime
+-XX:+PrintPromotionFailure
#-XX:PrintFLSStatistics=1
#-Xloggc:/var/log/cassandra/gc.log
-#-XX:+UseGCLogFileRotation
-#-XX:NumberOfGCLogFiles=10
-#-XX:GCLogFileSize=10M
+-XX:+UseGCLogFileRotation
+-XX:NumberOfGCLogFiles=10
+-XX:GCLogFileSize=10M
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..87387b9 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:35:22.000000000 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:41:38.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:40:39.000000000 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:42:40.647449856 -0500
+@@ -204,7 +204,7 @@
+ esac
+
+ #GC log path has to be defined here because it needs to access CASSANDRA_HOME
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+
+ # Here we create the arguments that will get passed to the jvm when
+ # starting cassandra.
[16/19] cassandra git commit: Enable GC logging by default (3.0
version)
Posted by sl...@apache.org.
Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e45fa1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e45fa1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e45fa1a
Branch: refs/heads/cassandra-3.3
Commit: 3e45fa1ab521bd50eb247f58daa2bfa76c6ab4e5
Parents: 2fd0c15
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Tue Dec 29 14:33:26 2015 -0500
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:01:29 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 2 ++
conf/cassandra-env.ps1 | 3 +++
conf/cassandra-env.sh | 5 ++++-
conf/jvm.options | 18 +++++++++---------
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b5610e..103ae05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
* Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
Merged from 2.2:
+ * Enable GC logging by default (CASSANDRA-10140)
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 8a03e14..26a83a9 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -32,6 +32,8 @@ Upgrading
- Custom index implementation should be aware that the method Indexer::indexes()
has been removed as its contract was misleading and all custom implementation
should have almost surely returned true inconditionally for that method.
+ - GC logging is now enabled by default (you can disable it in the jvm.options
+ file if you prefer).
3.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index a38429e..5eefb04 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -333,6 +333,9 @@ Function SetCassandraEnvironment
ParseJVMInfo
+ #GC log path has to be defined here since it needs to find CASSANDRA_HOME
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
+
# Read user-defined JVM options from jvm.options file
$content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
for ($i = 0; $i -lt $content.Count; $i++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index ef164e8..f322803 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -33,7 +33,7 @@ calculate_heap_sizes()
Darwin)
system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'`
system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024`
- system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'`
+
;;
*)
# assume reasonable defaults for e.g. a modern desktop or
@@ -156,6 +156,9 @@ if [ "x$MALLOC_ARENA_MAX" = "x" ] ; then
export MALLOC_ARENA_MAX=4
fi
+#GC log path has to be defined here because it needs to access CASSANDRA_HOME
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
+
# Here we create the arguments that will get passed to the jvm when
# starting cassandra.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/conf/jvm.options
----------------------------------------------------------------------
diff --git a/conf/jvm.options b/conf/jvm.options
index c5d3d95..a7b3bd8 100644
--- a/conf/jvm.options
+++ b/conf/jvm.options
@@ -95,14 +95,14 @@
### GC logging options -- uncomment to enable
-#-XX:+PrintGCDetails
-#-XX:+PrintGCDateStamps
-#-XX:+PrintHeapAtGC
-#-XX:+PrintTenuringDistribution
-#-XX:+PrintGCApplicationStoppedTime
-#-XX:+PrintPromotionFailure
+-XX:+PrintGCDetails
+-XX:+PrintGCDateStamps
+-XX:+PrintHeapAtGC
+-XX:+PrintTenuringDistribution
+-XX:+PrintGCApplicationStoppedTime
+-XX:+PrintPromotionFailure
#-XX:PrintFLSStatistics=1
#-Xloggc:/var/log/cassandra/gc.log
-#-XX:+UseGCLogFileRotation
-#-XX:NumberOfGCLogFiles=10
-#-XX:GCLogFileSize=10M
+-XX:+UseGCLogFileRotation
+-XX:NumberOfGCLogFiles=10
+-XX:GCLogFileSize=10M
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e45fa1a/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
index 8836eb4..87387b9 100644
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
-+++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
-@@ -134,7 +134,7 @@
+--- cassandra~/bin/cassandra 2015-10-27 14:35:22.000000000 -0500
++++ cassandra/bin/cassandra 2015-10-27 14:41:38.000000000 -0500
+@@ -139,7 +139,7 @@
props="$3"
class="$4"
cassandra_parms="-Dlogback.configurationFile=logback.xml"
@@ -17,3 +17,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
if [ "x$pidpath" != "x" ]; then
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2015-10-27 14:40:39.000000000 -0500
++++ cassandra/conf/cassandra-env.sh 2015-10-27 14:42:40.647449856 -0500
+@@ -204,7 +204,7 @@
+ esac
+
+ #GC log path has to be defined here because it needs to access CASSANDRA_HOME
+-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
++JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
+
+ # Here we create the arguments that will get passed to the jvm when
+ # starting cassandra.