cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1026730 - /cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java
Date Sun, 24 Oct 2010 01:09:49 GMT
Author: jbellis
Date: Sun Oct 24 01:09:49 2010
New Revision: 1026730

URL: http://svn.apache.org/viewvc?rev=1026730&view=rev
Log:
update Converter to switch default thrift mode to framed.  patch by Stu Hood; reviewed by
jbellis for CASSANDRA-1659

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java?rev=1026730&r1=1026729&r2=1026730&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java Sun Oct 24 01:09:49
2010
@@ -54,7 +54,6 @@ public class Converter
 
     private static List<RawKeyspace> readTablesFromXml(XMLUtils xmlUtils) throws ConfigurationException
     {
-
         List<RawKeyspace> keyspaces = new ArrayList<RawKeyspace>();
         /* Read the table related stuff from config */
         try
@@ -184,7 +183,6 @@ public class Converter
             throw new ConfigurationException("Error occurred during the transformation process.");
         }
     }
-
     
     private static void loadPreviousConfig(String config) throws ConfigurationException
     {
@@ -266,14 +264,9 @@ public class Converter
             String framedRaw = xmlUtils.getNodeValue("/Storage/ThriftFramedTransport");
             if (framedRaw != null && !Boolean.valueOf(framedRaw))
             {
-                conf.thrift_framed_transport_size_in_mb = 0;
-                System.out.println("WARN : Thrift uses framed Transport by default in 0.7!
Setting TFramedTransportSize to 0MB (disabled).");
-            }
-            else
-            {
-                conf.thrift_framed_transport_size_in_mb = 15;
-                System.out.println("TFramedTransport will have a maximum frame size of 15MB");
+                System.out.println("WARN : Cassandra uses a Thrift framed Transport by default
in 0.7! Clients will need to match.");
             }
+            conf.thrift_framed_transport_size_in_mb = 15;
             
             String sbc = xmlUtils.getNodeValue("/Storage/SnapshotBeforeCompaction");
             if (sbc != null)



Mime
View raw message