Merge pull request #178 from datastax/ruby-233_tests

[RUBY-233] Integration tests for idempotent statement timeouts

Author: kishkaru

build.yaml

@@ -7,7 +7,7 @@ cassandra:
   - 2.1
   - 2.2
   - 3.0
-  - 3.4
+  - 3.7
 os:
   - ubuntu/trusty64
 build:

integration/idempotency_test.rb

@@ -20,12 +20,12 @@
 
 class IdempotencyTest < IntegrationTestCase
   def self.before_suite
-    @@ccm_cluster = CCM.setup_cluster(1, 2)
+    @@ccm_cluster = CCM.setup_cluster(2, 1)
   end
 
   def setup
     @@ccm_cluster.setup_schema(<<-CQL)
-    CREATE KEYSPACE simplex WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 2};
+    CREATE KEYSPACE simplex WITH replication = {'class': 'NetworkTopologyStrategy', 'dc1': '1', 'dc2': '1'};
     USE simplex;
     CREATE TABLE test (k int, v int, PRIMARY KEY (k, v));
     INSERT INTO test (k, v) VALUES (0, 0)
@@ -37,28 +37,73 @@ def setup
   # test_statement_idempotency_on_timeout tests that idempotent statements are retried automatically on the next host.
   # It first blocks the first host such that it is unreachable. It then attempts a simple SELECT query and verifies that
   # a Cassandra::Errors::TimeoutError is raised, and the next host is not tried. It finally executes the same query
-  # once more with idempotent: true and verifies that the statement executes successfully.
+  # once more with idempotent: true and verifies that the statement executes successfully on another host.
   #
   # @expected_errors [Cassandra::Errors::TimeoutError] When a host is unavailable on a non-idempotent query
   #
   # @since 3.0.0
   # @jira_ticket RUBY-146
   # @expected_result Idempotent queries should be retried on the next host automatically
   #
-  # @test_assumptions A 2-node Cassandra cluster with RF=2.
+  # @test_assumptions A 2-dc Cassandra cluster 1 node in each dc.
   # @test_category queries:timeout
   #
   def test_statement_idempotency_on_timeout
-    cluster = Cassandra.cluster
-    session = cluster.connect("simplex")
+    datacenter = 'dc1'
+    max_remote_hosts_to_use = 1
+    policy = Cassandra::LoadBalancing::Policies::DCAwareRoundRobin.new(datacenter, max_remote_hosts_to_use)
+    cluster = Cassandra.cluster(load_balancing_policy: policy)
+    session = cluster.connect('simplex')
 
-    @@ccm_cluster.block_node("node1")
+    @@ccm_cluster.block_node('node1')
 
     assert_raises(Cassandra::Errors::TimeoutError) do
-      session.execute("SELECT * FROM test", consistency: :one)
+      session.execute('SELECT * FROM test', consistency: :one)
     end
 
-    session.execute("SELECT * FROM test", consistency: :one, idempotent: true)
+    info = session.execute('SELECT * FROM test', consistency: :one, idempotent: true).execution_info
+    assert_equal 2, info.hosts.size
+    assert_equal '127.0.0.1', info.hosts[0].ip.to_s
+    assert_equal '127.0.0.2', info.hosts[1].ip.to_s
+  ensure
+    @@ccm_cluster.unblock_nodes
+    cluster && cluster.close
+  end
+
+  # Test for retrying idempotent statements on timeout
+  #
+  # test_statement_idempotency_on_timeout tests that idempotent statements are retried automatically on the next host,
+  # when the keyspace is not predefined. It first blocks the first host such that it is unreachable. It then attempts a
+  # simple SELECT query and verifies that a Cassandra::Errors::TimeoutError is raised, and the next host is not tried.
+  # It finally executes the same query once more with idempotent: true and verifies that the statement executes
+  # successfully on another host.
+  #
+  # @expected_errors [Cassandra::Errors::TimeoutError] When a host is unavailable on a non-idempotent query
+  #
+  # @since 3.0.1
+  # @jira_ticket RUBY-233
+  # @expected_result Idempotent queries should be retried on the next host automatically
+  #
+  # @test_assumptions A 2-dc Cassandra cluster 1 node in each dc.
+  # @test_category queries:timeout
+  #
+  def test_statement_idempotency_on_timeout_no_keyspace_predefined
+    datacenter = 'dc1'
+    max_remote_hosts_to_use = 1
+    policy = Cassandra::LoadBalancing::Policies::DCAwareRoundRobin.new(datacenter, max_remote_hosts_to_use)
+    cluster = Cassandra.cluster(load_balancing_policy: policy)
+    session = cluster.connect
+
+    @@ccm_cluster.block_node('node1')
+
+    assert_raises(Cassandra::Errors::TimeoutError) do
+      session.execute('SELECT * FROM simplex.test', consistency: :one)
+    end
+
+    info = session.execute('SELECT * FROM simplex.test', consistency: :one, idempotent: true).execution_info
+    assert_equal 2, info.hosts.size
+    assert_equal '127.0.0.1', info.hosts[0].ip.to_s
+    assert_equal '127.0.0.2', info.hosts[1].ip.to_s
   ensure
     @@ccm_cluster.unblock_nodes
     cluster && cluster.close

integration/integration_test_case.rb

@@ -29,7 +29,7 @@ class IntegrationTestCase < MiniTest::Unit::TestCase
   @@ccm_cluster = nil
 
   def self.before_suite
-    @@ccm_cluster = CCM.setup_cluster(1, 1)
+    @@ccm_cluster = CCM.setup_cluster(1, 1) unless self == IntegrationTestCase
   end
 
   def self.after_suite