You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/02/28 22:18:42 UTC
[01/10] git commit: Add CMSClassUnloadingEnabled JVM option Patch by
Jonathan Lacefield, reviewed by brandonwilliams for CASSANDRA-6541
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 e5b92d8ad -> f08ae394f
refs/heads/cassandra-2.0 9a62ef339 -> fd53628cb
refs/heads/cassandra-2.1 d55e191df -> bbad16b7e
refs/heads/trunk 2766711cb -> e449450b8
Add CMSClassUnloadingEnabled JVM option
Patch by Jonathan Lacefield, reviewed by brandonwilliams for
CASSANDRA-6541
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f08ae394
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f08ae394
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f08ae394
Branch: refs/heads/cassandra-1.2
Commit: f08ae394f0a3ab31260eb0a808160663a857f796
Parents: e5b92d8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:11:50 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:11:50 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 53da840..780b528 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index af996ef..aa4c3dd 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,6 +160,9 @@ then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
fi
+# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e449450b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e449450b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e449450b
Branch: refs/heads/trunk
Commit: e449450b8a18eabe0d2a3e62a2978c13199302af
Parents: 2766711 bbad16b
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:15:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:15:17 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e449450b/CHANGES.txt
----------------------------------------------------------------------
[02/10] git commit: Add CMSClassUnloadingEnabled JVM option Patch by
Jonathan Lacefield, reviewed by brandonwilliams for CASSANDRA-6541
Posted by br...@apache.org.
Add CMSClassUnloadingEnabled JVM option
Patch by Jonathan Lacefield, reviewed by brandonwilliams for
CASSANDRA-6541
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f08ae394
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f08ae394
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f08ae394
Branch: refs/heads/cassandra-2.0
Commit: f08ae394f0a3ab31260eb0a808160663a857f796
Parents: e5b92d8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:11:50 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:11:50 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 53da840..780b528 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index af996ef..aa4c3dd 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,6 +160,9 @@ then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
fi
+# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbad16b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbad16b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbad16b7
Branch: refs/heads/cassandra-2.1
Commit: bbad16b7ee78333f75dc27ea3f3558bbec5c326c
Parents: d55e191 fd53628
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:15:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:15:07 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbad16b7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 53e1e6f,d6c9ae6..1829683
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,46 -27,23 +35,47 @@@ Merged from 2.0
* Optimize single partition batch statements (CASSANDRA-6737)
* Disallow post-query re-ordering when paging (CASSANDRA-6722)
* Fix potential paging bug with deleted columns (CASSANDRA-6748)
-Merged from 1.2:
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
- * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
- * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
- * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
- * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
- * Don't exchange schema between nodes with different versions (CASSANDRA-6695)
- * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
- * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
- * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
- * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
- * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
- * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631)
- * Fix bootstrapping when there is no schema (CASSANDRA-6685)
+
+
+2.1.0-beta1
+ * Add flush directory distinct from compaction directories (CASSANDRA-6357)
+ * Require JNA by default (CASSANDRA-6575)
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
+ ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
+ * Avoid repairing already repaired data (CASSANDRA-5351)
+ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
+ * Replace index_interval with min/max_index_interval (CASSANDRA-6379)
+ * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
2.0.5
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbad16b7/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index 20f26da,934e463..6b26099
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -165,9 -165,12 +165,12 @@@ JVM_OPTS="$JVM_OPTS -ea
if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
|| [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
then
- JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+ JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
fi
+ # some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+ JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd53628c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd53628c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd53628c
Branch: refs/heads/trunk
Commit: fd53628cb0e229e1ecc095eeebde056f0ae3e202
Parents: 9a62ef3 f08ae39
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:14:24 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:14:24 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd53628c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 389ee2b,780b528..d6c9ae6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,8 +1,35 @@@
-1.2.16
+2.0.6
+ * Pool CqlRecordWriter clients by inetaddress rather than Range
+ (CASSANDRA-6665)
+ * Fix compaction_history timestamps (CASSANDRA-6784)
+ * Compare scores of full replica ordering in DES (CASSANDRA-6883)
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
+ * Fix EstimatedHistogram races (CASSANDRA-6682)
+ * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
+ * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
+ * Expose bulk loading progress over JMX (CASSANDRA-4757)
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
+ * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
+ * Make commitlog failure handling configurable (CASSANDRA-6364)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+ * Add static columns to CQL3 (CASSANDRA-6561)
+ * Optimize single partition batch statements (CASSANDRA-6737)
+ * Disallow post-query re-ordering when paging (CASSANDRA-6722)
+ * Fix potential paging bug with deleted columns (CASSANDRA-6748)
+Merged from 1.2:
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd53628c/conf/cassandra-env.sh
----------------------------------------------------------------------
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd53628c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd53628c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd53628c
Branch: refs/heads/cassandra-2.1
Commit: fd53628cb0e229e1ecc095eeebde056f0ae3e202
Parents: 9a62ef3 f08ae39
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:14:24 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:14:24 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd53628c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 389ee2b,780b528..d6c9ae6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,8 +1,35 @@@
-1.2.16
+2.0.6
+ * Pool CqlRecordWriter clients by inetaddress rather than Range
+ (CASSANDRA-6665)
+ * Fix compaction_history timestamps (CASSANDRA-6784)
+ * Compare scores of full replica ordering in DES (CASSANDRA-6883)
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
+ * Fix EstimatedHistogram races (CASSANDRA-6682)
+ * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
+ * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
+ * Expose bulk loading progress over JMX (CASSANDRA-4757)
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
+ * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
+ * Make commitlog failure handling configurable (CASSANDRA-6364)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+ * Add static columns to CQL3 (CASSANDRA-6561)
+ * Optimize single partition batch statements (CASSANDRA-6737)
+ * Disallow post-query re-ordering when paging (CASSANDRA-6722)
+ * Fix potential paging bug with deleted columns (CASSANDRA-6748)
+Merged from 1.2:
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd53628c/conf/cassandra-env.sh
----------------------------------------------------------------------
[03/10] git commit: Add CMSClassUnloadingEnabled JVM option Patch by
Jonathan Lacefield, reviewed by brandonwilliams for CASSANDRA-6541
Posted by br...@apache.org.
Add CMSClassUnloadingEnabled JVM option
Patch by Jonathan Lacefield, reviewed by brandonwilliams for
CASSANDRA-6541
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f08ae394
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f08ae394
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f08ae394
Branch: refs/heads/cassandra-2.1
Commit: f08ae394f0a3ab31260eb0a808160663a857f796
Parents: e5b92d8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:11:50 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:11:50 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 53da840..780b528 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index af996ef..aa4c3dd 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,6 +160,9 @@ then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
fi
+# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbad16b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbad16b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbad16b7
Branch: refs/heads/trunk
Commit: bbad16b7ee78333f75dc27ea3f3558bbec5c326c
Parents: d55e191 fd53628
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:15:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:15:07 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbad16b7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 53e1e6f,d6c9ae6..1829683
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,46 -27,23 +35,47 @@@ Merged from 2.0
* Optimize single partition batch statements (CASSANDRA-6737)
* Disallow post-query re-ordering when paging (CASSANDRA-6722)
* Fix potential paging bug with deleted columns (CASSANDRA-6748)
-Merged from 1.2:
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
- * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
- * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
- * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
- * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
- * Don't exchange schema between nodes with different versions (CASSANDRA-6695)
- * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
- * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
- * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
- * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
- * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
- * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631)
- * Fix bootstrapping when there is no schema (CASSANDRA-6685)
+
+
+2.1.0-beta1
+ * Add flush directory distinct from compaction directories (CASSANDRA-6357)
+ * Require JNA by default (CASSANDRA-6575)
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
+ ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
+ * Avoid repairing already repaired data (CASSANDRA-5351)
+ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
+ * Replace index_interval with min/max_index_interval (CASSANDRA-6379)
+ * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
2.0.5
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbad16b7/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index 20f26da,934e463..6b26099
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -165,9 -165,12 +165,12 @@@ JVM_OPTS="$JVM_OPTS -ea
if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
|| [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
then
- JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+ JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
fi
+ # some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+ JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"
[04/10] git commit: Add CMSClassUnloadingEnabled JVM option Patch by
Jonathan Lacefield, reviewed by brandonwilliams for CASSANDRA-6541
Posted by br...@apache.org.
Add CMSClassUnloadingEnabled JVM option
Patch by Jonathan Lacefield, reviewed by brandonwilliams for
CASSANDRA-6541
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f08ae394
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f08ae394
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f08ae394
Branch: refs/heads/trunk
Commit: f08ae394f0a3ab31260eb0a808160663a857f796
Parents: e5b92d8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:11:50 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:11:50 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 53da840..780b528 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08ae394/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index af996ef..aa4c3dd 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,6 +160,9 @@ then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
fi
+# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd53628c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd53628c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd53628c
Branch: refs/heads/cassandra-2.0
Commit: fd53628cb0e229e1ecc095eeebde056f0ae3e202
Parents: 9a62ef3 f08ae39
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 15:14:24 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 15:14:24 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd53628c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 389ee2b,780b528..d6c9ae6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,8 +1,35 @@@
-1.2.16
+2.0.6
+ * Pool CqlRecordWriter clients by inetaddress rather than Range
+ (CASSANDRA-6665)
+ * Fix compaction_history timestamps (CASSANDRA-6784)
+ * Compare scores of full replica ordering in DES (CASSANDRA-6883)
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
+ * Fix EstimatedHistogram races (CASSANDRA-6682)
+ * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
+ * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
+ * Expose bulk loading progress over JMX (CASSANDRA-4757)
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
+ * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
+ * Make commitlog failure handling configurable (CASSANDRA-6364)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+ * Add static columns to CQL3 (CASSANDRA-6561)
+ * Optimize single partition batch statements (CASSANDRA-6737)
+ * Disallow post-query re-ordering when paging (CASSANDRA-6722)
+ * Fix potential paging bug with deleted columns (CASSANDRA-6748)
+Merged from 1.2:
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd53628c/conf/cassandra-env.sh
----------------------------------------------------------------------