Add back error case if trace is too big

openzipkin · Aug 2, 2012 · 96a4df4 · 96a4df4
1 parent 8755d09
commit 96a4df4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/zipkin-server/src/main/scala/com/twitter/zipkin/storage/cassandra/CassandraStorage.scala b/zipkin-server/src/main/scala/com/twitter/zipkin/storage/cassandra/CassandraStorage.scala
@@ -110,8 +110,16 @@ trait CassandraStorage extends Storage with Cassandra {
             }
 
             spans.toSeq match {
-              case Nil => None
-              case s   => Some(s)
+              case Nil => {
+                None
+              }
+              case s if s.length > TRACE_MAX_COLS => {
+                CASSANDRA_GET_TRACE_TOO_BIG.incr()
+                None
+              }
+              case s => {
+                Some(s)
+              }
             }
           }
         }