You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/24 17:48:08 UTC
[01/11] git commit: merge from 1.2
Updated Branches:
refs/heads/cassandra-1.2 fa8d92312 -> 546485310
refs/heads/cassandra-2.0 424206a15 -> 07638f41a
refs/heads/trunk 938e6989a -> 2fea9fab0
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3dddb3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3dddb3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3dddb3b
Branch: refs/heads/cassandra-2.0
Commit: f3dddb3bd5e0332717d36d40effba363dd230853
Parents: 7c6e552 bb3ec4c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:14:04 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:14:04 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 3 ++-
3 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1bdb6a8,ae2ab5e..54b2e9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,13 +1,52 @@@
-1.2.11
+2.0.2
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+Merged from 1.2:
+ * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Move batchlog replay to its own executor (CASSANDRA-6079)
* Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
+ * Enable tcp keepalive on incoming connections (CASSANDRA-4053)
+
-1.2.10
+2.0.1
+ * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
+ * Improve memory use defaults (CASSANDRA-5069)
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[07/11] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7af56b5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7af56b5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7af56b5a
Branch: refs/heads/trunk
Commit: 7af56b5ae4c3b201a2633745042233ef66766ec2
Parents: f3dddb3 1b79d6e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:46:48 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:46:48 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af56b5a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 54b2e9e,a5903fa..4d52c99
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-1.2.11
+2.0.2
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+Merged from 1.2:
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af56b5a/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 2879f1d,448bb0a..ae8a5a2
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -331,10 -339,7 +335,7 @@@ public class CassandraDaemo
};
StorageService.optionalTasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS);
- // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
- StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
-
- SystemTable.finishStartup();
+ SystemKeyspace.finishStartup();
// start server internals
StorageService.instance.registerDaemon(this);
[10/11] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07638f41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07638f41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07638f41
Branch: refs/heads/cassandra-2.0
Commit: 07638f41a8c62932b05bdb498aaaedabd2efd139
Parents: 7af56b5 424206a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:47:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:47:40 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
examples/client_only/src/ClientOnlyExample.java | 109 ++++---------------
src/java/org/apache/cassandra/auth/Auth.java | 5 +-
.../cassandra/auth/CassandraAuthorizer.java | 2 +-
.../cassandra/auth/PasswordAuthenticator.java | 2 +-
.../apache/cassandra/cql3/QueryProcessor.java | 5 +-
.../org/apache/cassandra/cql3/ResultSet.java | 11 +-
.../cql3/statements/ListUsersStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 4 +-
.../apache/cassandra/service/ClientState.java | 64 +++++++----
.../apache/cassandra/service/QueryState.java | 8 ++
.../cassandra/thrift/ThriftClientState.java | 11 +-
.../cassandra/thrift/ThriftSessionManager.java | 6 +-
.../org/apache/cassandra/tools/NodeCmd.java | 7 ++
.../cassandra/transport/ServerConnection.java | 6 +-
15 files changed, 114 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07638f41/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4d52c99,281665e..830f568
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -2,8 -2,9 +2,10 @@@
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
* Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
* Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
Merged from 1.2:
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
[05/11] git commit: Start MeteredFlusher earlier to prevent OOM
during CL replay patch by Oleg Anastasyev;
reviewed by jbellis for CASSANDRA-7078
Posted by jb...@apache.org.
Start MeteredFlusher earlier to prevent OOM during CL replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7078
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b79d6ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b79d6ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b79d6ed
Branch: refs/heads/trunk
Commit: 1b79d6ed4f19752369a0345ae8d611ec107746d5
Parents: bb3ec4c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:44:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:44:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b79d6ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ae2ab5e..a5903fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.11
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b79d6ed/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index b2fc367..448bb0a 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -297,6 +297,10 @@ public class CassandraDaemon
logger.warn("Unable to start GCInspector (currently only supported on the Sun JVM)");
}
+ // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
+ // Start it before commit log, so memtables can flush during commit log replay
+ StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
+
// replay the log if necessary
try
{
@@ -335,9 +339,6 @@ public class CassandraDaemon
};
StorageService.optionalTasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS);
- // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
- StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
-
SystemTable.finishStartup();
// start server internals
[03/11] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/108b4db5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/108b4db5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/108b4db5
Branch: refs/heads/trunk
Commit: 108b4db53bfc5d7507ccca228ca942d85eb3dc0a
Parents: 99691be f3dddb3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:14:12 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:14:12 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 3 ++-
3 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/108b4db5/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/108b4db5/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/108b4db5/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[11/11] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fea9fab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fea9fab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fea9fab
Branch: refs/heads/trunk
Commit: 2fea9fab059dc8f3bdfb0c29eef6dd5d162342e8
Parents: bab62d5 938e698
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:48:03 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:48:03 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
examples/client_only/src/ClientOnlyExample.java | 109 ++++---------------
src/java/org/apache/cassandra/auth/Auth.java | 5 +-
.../cassandra/auth/CassandraAuthorizer.java | 2 +-
.../cassandra/auth/PasswordAuthenticator.java | 2 +-
.../apache/cassandra/cql3/QueryProcessor.java | 5 +-
.../org/apache/cassandra/cql3/ResultSet.java | 11 +-
.../cql3/statements/ListUsersStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 4 +-
.../apache/cassandra/service/ClientState.java | 64 +++++++----
.../apache/cassandra/service/QueryState.java | 8 ++
.../cassandra/thrift/ThriftClientState.java | 11 +-
.../cassandra/thrift/ThriftSessionManager.java | 6 +-
.../org/apache/cassandra/tools/NodeCmd.java | 7 ++
.../cassandra/transport/ServerConnection.java | 6 +-
15 files changed, 114 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fea9fab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 60cae04,cd6fd05..97c99d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,8 -10,9 +10,10 @@@
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
* Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
* Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
Merged from 1.2:
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
[06/11] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7af56b5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7af56b5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7af56b5a
Branch: refs/heads/cassandra-2.0
Commit: 7af56b5ae4c3b201a2633745042233ef66766ec2
Parents: f3dddb3 1b79d6e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:46:48 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:46:48 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af56b5a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 54b2e9e,a5903fa..4d52c99
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-1.2.11
+2.0.2
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+Merged from 1.2:
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af56b5a/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 2879f1d,448bb0a..ae8a5a2
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -331,10 -339,7 +335,7 @@@ public class CassandraDaemo
};
StorageService.optionalTasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS);
- // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
- StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
-
- SystemTable.finishStartup();
+ SystemKeyspace.finishStartup();
// start server internals
StorageService.instance.registerDaemon(this);
[09/11] git commit: Start MeteredFlusher earlier to prevent OOM
during CL replay patch by Oleg Anastasyev;
reviewed by jbellis for CASSANDRA-7078
Posted by jb...@apache.org.
Start MeteredFlusher earlier to prevent OOM during CL replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7078
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54648531
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54648531
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54648531
Branch: refs/heads/cassandra-1.2
Commit: 546485310e20dd2c6c67f863cba4b5acd1bae586
Parents: fa8d923
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:44:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:47:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54648531/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ae2ab5e..a5903fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.11
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54648531/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index b2fc367..448bb0a 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -297,6 +297,10 @@ public class CassandraDaemon
logger.warn("Unable to start GCInspector (currently only supported on the Sun JVM)");
}
+ // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
+ // Start it before commit log, so memtables can flush during commit log replay
+ StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
+
// replay the log if necessary
try
{
@@ -335,9 +339,6 @@ public class CassandraDaemon
};
StorageService.optionalTasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS);
- // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
- StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
-
SystemTable.finishStartup();
// start server internals
[08/11] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bab62d56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bab62d56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bab62d56
Branch: refs/heads/trunk
Commit: bab62d560628e115b6ee86e9b24b7dccc3e288bc
Parents: 108b4db 7af56b5
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:46:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:46:56 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab62d56/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab62d56/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[02/11] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3dddb3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3dddb3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3dddb3b
Branch: refs/heads/trunk
Commit: f3dddb3bd5e0332717d36d40effba363dd230853
Parents: 7c6e552 bb3ec4c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:14:04 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:14:04 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 3 ++-
3 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1bdb6a8,ae2ab5e..54b2e9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,13 +1,52 @@@
-1.2.11
+2.0.2
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+Merged from 1.2:
+ * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Move batchlog replay to its own executor (CASSANDRA-6079)
* Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
+ * Enable tcp keepalive on incoming connections (CASSANDRA-4053)
+
-1.2.10
+2.0.1
+ * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
+ * Improve memory use defaults (CASSANDRA-5069)
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[04/11] git commit: Start MeteredFlusher earlier to prevent OOM
during CL replay patch by Oleg Anastasyev;
reviewed by jbellis for CASSANDRA-7078
Posted by jb...@apache.org.
Start MeteredFlusher earlier to prevent OOM during CL replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7078
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b79d6ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b79d6ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b79d6ed
Branch: refs/heads/cassandra-2.0
Commit: 1b79d6ed4f19752369a0345ae8d611ec107746d5
Parents: bb3ec4c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:44:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:44:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b79d6ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ae2ab5e..a5903fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.11
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b79d6ed/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index b2fc367..448bb0a 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -297,6 +297,10 @@ public class CassandraDaemon
logger.warn("Unable to start GCInspector (currently only supported on the Sun JVM)");
}
+ // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
+ // Start it before commit log, so memtables can flush during commit log replay
+ StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
+
// replay the log if necessary
try
{
@@ -335,9 +339,6 @@ public class CassandraDaemon
};
StorageService.optionalTasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS);
- // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
- StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
-
SystemTable.finishStartup();
// start server internals