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/10/09 14:36:25 UTC
[1/6] git commit: Log UnknownColumnfamilyException when closing
socket patch by Suresh;
reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Updated Branches:
refs/heads/cassandra-1.2 d8d764db2 -> d30e328a3
refs/heads/cassandra-2.0 c198b76c4 -> d0fae0999
refs/heads/trunk 152da3cb5 -> 9a1212328
Log UnknownColumnfamilyException when closing socket
patch by Suresh; reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d30e328a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d30e328a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d30e328a
Branch: refs/heads/cassandra-1.2
Commit: d30e328a33595475fa9837dbc9dc98bc17b08ff7
Parents: d8d764d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 07:35:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 07:35:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d30e328a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4ee9f4..aa43124 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
* Optimize auth setup (CASSANDRA-6122)
* Trace index selection (CASSANDRA-6001)
* Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164)
+ * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d30e328a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index aa8378e..3b24a7f 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -24,13 +24,14 @@ import java.net.SocketException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xerial.snappy.SnappyInputStream;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.io.util.FastByteArrayInputStream;
import org.apache.cassandra.streaming.IncomingStreamReader;
import org.apache.cassandra.streaming.StreamHeader;
-import org.xerial.snappy.SnappyInputStream;
+import org.apache.cassandra.db.UnknownColumnFamilyException;
public class IncomingTcpConnection extends Thread
{
@@ -86,6 +87,10 @@ public class IncomingTcpConnection extends Thread
logger.trace("eof reading from socket; closing", e);
// connection will be reset so no need to throw an exception.
}
+ catch (UnknownColumnFamilyException e)
+ {
+ logger.warn("UnknownColumnFamilyException reading from socket; closing", e);
+ }
catch (IOException e)
{
logger.debug("IOException reading from socket; closing", e);
[6/6] 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/9a121232
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a121232
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a121232
Branch: refs/heads/trunk
Commit: 9a1212328b066e57f11424153b9a3ed5eeaa0345
Parents: 152da3c d0fae09
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 07:36:21 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 07:36:21 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a121232/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a121232/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
[5/6] 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/d0fae099
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0fae099
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0fae099
Branch: refs/heads/cassandra-2.0
Commit: d0fae0999b038012462560f30e18a464deb8ce91
Parents: c198b76 d30e328
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 07:36:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 07:36:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0fae099/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2b37a39,aa43124..87a5cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,43 -17,10 +42,44 @@@ Merged from 1.2
* Optimize auth setup (CASSANDRA-6122)
* Trace index selection (CASSANDRA-6001)
* Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164)
+ * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725)
-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/d0fae099/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 52de099,3b24a7f..f0449c4
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -27,7 -27,11 +27,8 @@@ import org.slf4j.LoggerFactory
import org.xerial.snappy.SnappyInputStream;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.io.util.FastByteArrayInputStream;
-import org.apache.cassandra.streaming.IncomingStreamReader;
-import org.apache.cassandra.streaming.StreamHeader;
+ import org.apache.cassandra.db.UnknownColumnFamilyException;
+import org.apache.cassandra.gms.Gossiper;
public class IncomingTcpConnection extends Thread
{
[3/6] git commit: Log UnknownColumnfamilyException when closing
socket patch by Suresh;
reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Posted by jb...@apache.org.
Log UnknownColumnfamilyException when closing socket
patch by Suresh; reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d30e328a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d30e328a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d30e328a
Branch: refs/heads/trunk
Commit: d30e328a33595475fa9837dbc9dc98bc17b08ff7
Parents: d8d764d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 07:35:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 07:35:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d30e328a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4ee9f4..aa43124 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
* Optimize auth setup (CASSANDRA-6122)
* Trace index selection (CASSANDRA-6001)
* Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164)
+ * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d30e328a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index aa8378e..3b24a7f 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -24,13 +24,14 @@ import java.net.SocketException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xerial.snappy.SnappyInputStream;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.io.util.FastByteArrayInputStream;
import org.apache.cassandra.streaming.IncomingStreamReader;
import org.apache.cassandra.streaming.StreamHeader;
-import org.xerial.snappy.SnappyInputStream;
+import org.apache.cassandra.db.UnknownColumnFamilyException;
public class IncomingTcpConnection extends Thread
{
@@ -86,6 +87,10 @@ public class IncomingTcpConnection extends Thread
logger.trace("eof reading from socket; closing", e);
// connection will be reset so no need to throw an exception.
}
+ catch (UnknownColumnFamilyException e)
+ {
+ logger.warn("UnknownColumnFamilyException reading from socket; closing", e);
+ }
catch (IOException e)
{
logger.debug("IOException reading from socket; closing", e);
[2/6] git commit: Log UnknownColumnfamilyException when closing
socket patch by Suresh;
reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Posted by jb...@apache.org.
Log UnknownColumnfamilyException when closing socket
patch by Suresh; reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d30e328a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d30e328a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d30e328a
Branch: refs/heads/cassandra-2.0
Commit: d30e328a33595475fa9837dbc9dc98bc17b08ff7
Parents: d8d764d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 07:35:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 07:35:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d30e328a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4ee9f4..aa43124 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
* Optimize auth setup (CASSANDRA-6122)
* Trace index selection (CASSANDRA-6001)
* Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164)
+ * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d30e328a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index aa8378e..3b24a7f 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -24,13 +24,14 @@ import java.net.SocketException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xerial.snappy.SnappyInputStream;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.io.util.FastByteArrayInputStream;
import org.apache.cassandra.streaming.IncomingStreamReader;
import org.apache.cassandra.streaming.StreamHeader;
-import org.xerial.snappy.SnappyInputStream;
+import org.apache.cassandra.db.UnknownColumnFamilyException;
public class IncomingTcpConnection extends Thread
{
@@ -86,6 +87,10 @@ public class IncomingTcpConnection extends Thread
logger.trace("eof reading from socket; closing", e);
// connection will be reset so no need to throw an exception.
}
+ catch (UnknownColumnFamilyException e)
+ {
+ logger.warn("UnknownColumnFamilyException reading from socket; closing", e);
+ }
catch (IOException e)
{
logger.debug("IOException reading from socket; closing", e);
[4/6] 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/d0fae099
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0fae099
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0fae099
Branch: refs/heads/trunk
Commit: d0fae0999b038012462560f30e18a464deb8ce91
Parents: c198b76 d30e328
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 07:36:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 07:36:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0fae099/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2b37a39,aa43124..87a5cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,43 -17,10 +42,44 @@@ Merged from 1.2
* Optimize auth setup (CASSANDRA-6122)
* Trace index selection (CASSANDRA-6001)
* Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164)
+ * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725)
-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/d0fae099/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 52de099,3b24a7f..f0449c4
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -27,7 -27,11 +27,8 @@@ import org.slf4j.LoggerFactory
import org.xerial.snappy.SnappyInputStream;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.io.util.FastByteArrayInputStream;
-import org.apache.cassandra.streaming.IncomingStreamReader;
-import org.apache.cassandra.streaming.StreamHeader;
+ import org.apache.cassandra.db.UnknownColumnFamilyException;
+import org.apache.cassandra.gms.Gossiper;
public class IncomingTcpConnection extends Thread
{