Increase the default connect_timeout to 5 seconds to mitigate errors …

…on rapid schema changes
jnunemaker · Sep 25, 2012 · 48e1884 · 48e1884
1 parent 371de10
commit 48e1884
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/cassandra-cql/database.rb b/lib/cassandra-cql/database.rb
@@ -28,7 +28,8 @@ def initialize(servers, options={}, thrift_client_options={})
       }.merge(options)
 
       @thrift_client_options = {
-        :exception_class_overrides => CassandraCQL::Thrift::InvalidRequestException
+        :exception_class_overrides => CassandraCQL::Thrift::InvalidRequestException,
+        :connect_timeout => 5
       }.merge(thrift_client_options)
 
       @keyspace = @options[:keyspace]

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -22,7 +22,7 @@ def yaml_fixture(file)
 end
 
 def setup_cassandra_connection
-  connection = CassandraCQL::Database.new(["127.0.0.1:9160"], {}, :retries => 5, :timeout => 1, :connect_timeout => 5)
+  connection = CassandraCQL::Database.new(["127.0.0.1:9160"], {}, :retries => 5, :timeout => 1)
   if !connection.keyspaces.map(&:name).include?("CassandraCQLTestKeyspace")
     connection.execute("CREATE KEYSPACE CassandraCQLTestKeyspace WITH strategy_class='org.apache.cassandra.locator.SimpleStrategy' AND strategy_options:replication_factor=1")
   end