cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/6] git commit: Log UnknownColumnfamilyException when closing socket patch by Suresh; reviewed by Sergio Bossa and jbellis for CASSANDRA-5725
Date Wed, 09 Oct 2013 12:36:27 GMT
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 <jbellis@apache.org>
Authored: Wed Oct 9 07:35:08 2013 -0500
Committer: Jonathan Ellis <jbellis@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);


Mime
View raw message