Raise server-side timeouts for TokenIT tests

Author: adutra

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/ByteOrderedTokenIT.java

@@ -36,7 +36,14 @@
 public class ByteOrderedTokenIT extends TokenITBase {
 
   private static final CustomCcmRule CCM_RULE =
-      CustomCcmRule.builder().withNodes(3).withCreateOption("-p ByteOrderedPartitioner").build();
+      CustomCcmRule.builder()
+          .withNodes(3)
+          .withCreateOption("-p ByteOrderedPartitioner")
+          .withCassandraConfiguration("range_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("read_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("write_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("request_timeout_in_ms", 45_000)
+          .build();
 
   private static final SessionRule<CqlSession> SESSION_RULE =
       SessionRule.builder(CCM_RULE)

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/ByteOrderedTokenVnodesIT.java

@@ -40,6 +40,10 @@ public class ByteOrderedTokenVnodesIT extends TokenITBase {
           .withNodes(3)
           .withCreateOption("-p ByteOrderedPartitioner")
           .withCreateOption("--vnodes")
+          .withCassandraConfiguration("range_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("read_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("write_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("request_timeout_in_ms", 45_000)
           .build();
 
   private static final SessionRule<CqlSession> SESSION_RULE =

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/Murmur3TokenIT.java

@@ -29,7 +29,14 @@
 
 public class Murmur3TokenIT extends TokenITBase {
 
-  private static final CustomCcmRule CCM_RULE = CustomCcmRule.builder().withNodes(3).build();
+  private static final CustomCcmRule CCM_RULE =
+      CustomCcmRule.builder()
+          .withNodes(3)
+          .withCassandraConfiguration("range_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("read_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("write_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("request_timeout_in_ms", 45_000)
+          .build();
 
   private static final SessionRule<CqlSession> SESSION_RULE =
       SessionRule.builder(CCM_RULE)

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/Murmur3TokenVnodesIT.java

@@ -35,7 +35,14 @@
 public class Murmur3TokenVnodesIT extends TokenITBase {
 
   private static final CustomCcmRule CCM_RULE =
-      CustomCcmRule.builder().withNodes(3).withCreateOption("--vnodes").build();
+      CustomCcmRule.builder()
+          .withNodes(3)
+          .withCreateOption("--vnodes")
+          .withCassandraConfiguration("range_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("read_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("write_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("request_timeout_in_ms", 45_000)
+          .build();
 
   private static final SessionRule<CqlSession> SESSION_RULE =
       SessionRule.builder(CCM_RULE)

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/RandomTokenIT.java

@@ -30,7 +30,14 @@
 public class RandomTokenIT extends TokenITBase {
 
   private static final CustomCcmRule CCM_RULE =
-      CustomCcmRule.builder().withNodes(3).withCreateOption("-p RandomPartitioner").build();
+      CustomCcmRule.builder()
+          .withNodes(3)
+          .withCreateOption("-p RandomPartitioner")
+          .withCassandraConfiguration("range_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("read_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("write_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("request_timeout_in_ms", 45_000)
+          .build();
 
   private static final SessionRule<CqlSession> SESSION_RULE =
       SessionRule.builder(CCM_RULE)

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/RandomTokenVnodesIT.java

@@ -39,6 +39,10 @@ public class RandomTokenVnodesIT extends TokenITBase {
           .withNodes(3)
           .withCreateOption("-p RandomPartitioner")
           .withCreateOption("--vnodes")
+          .withCassandraConfiguration("range_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("read_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("write_request_timeout_in_ms", 45_000)
+          .withCassandraConfiguration("request_timeout_in_ms", 45_000)
           .build();
 
   private static final SessionRule<CqlSession> SESSION_RULE =

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/TokenITBase.java

@@ -102,6 +102,7 @@ public void should_be_consistent_with_range_queries() {
     int key = 1;
     ProtocolVersion protocolVersion = session().getContext().getProtocolVersion();
     ByteBuffer serializedKey = TypeCodecs.INT.encodePrimitive(key, protocolVersion);
+    assertThat(serializedKey).isNotNull();
     Set<Node> replicas = tokenMap.getReplicas(KS1, serializedKey);
     assertThat(replicas).hasSize(1);
     Node replica = replicas.iterator().next();
@@ -133,7 +134,7 @@ public void should_be_consistent_with_range_queries() {
   private List<Row> rangeQuery(PreparedStatement rangeStatement, TokenRange range) {
     List<Row> rows = Lists.newArrayList();
     for (TokenRange subRange : range.unwrap()) {
-      Statement statement = rangeStatement.bind(subRange.getStart(), subRange.getEnd());
+      Statement<?> statement = rangeStatement.bind(subRange.getStart(), subRange.getEnd());
       session().execute(statement).forEach(rows::add);
     }
     return rows;
@@ -156,10 +157,11 @@ private List<Row> rangeQuery(PreparedStatement rangeStatement, TokenRange range)
   public void should_get_token_from_row_and_set_token_in_query() {
     ResultSet rs = session().execute("SELECT token(i) FROM foo WHERE i = 1");
     Row row = rs.one();
+    assertThat(row).isNotNull();
 
     // Get by index:
     Token token = row.getToken(0);
-    assertThat(token).isInstanceOf(expectedTokenType);
+    assertThat(token).isNotNull().isInstanceOf(expectedTokenType);
 
     // Get by name: the generated column name depends on the Cassandra version.
     String tokenColumnName =
@@ -173,10 +175,12 @@ public void should_get_token_from_row_and_set_token_in_query() {
 
     // Bind with setToken by index
     row = session().execute(pst.bind().setToken(0, token)).one();
+    assertThat(row).isNotNull();
     assertThat(row.getInt(0)).isEqualTo(1);
 
     // Bind with setToken by name
     row = session().execute(pst.bind().setToken("partition key token", token)).one();
+    assertThat(row).isNotNull();
     assertThat(row.getInt(0)).isEqualTo(1);
   }
 
@@ -190,17 +194,20 @@ public void should_get_token_from_row_and_set_token_in_query() {
   @Test
   public void should_get_token_from_row_and_set_token_in_query_with_binding_and_aliasing() {
     Row row = session().execute("SELECT token(i) AS t FROM foo WHERE i = 1").one();
+    assertThat(row).isNotNull();
     Token token = row.getToken("t");
-    assertThat(token).isInstanceOf(expectedTokenType);
+    assertThat(token).isNotNull().isInstanceOf(expectedTokenType);
 
     PreparedStatement pst = session().prepare("SELECT * FROM foo WHERE token(i) = :myToken");
     row = session().execute(pst.bind().setToken("myToken", token)).one();
+    assertThat(row).isNotNull();
     assertThat(row.getInt(0)).isEqualTo(1);
 
     row =
         session()
             .execute(SimpleStatement.newInstance("SELECT * FROM foo WHERE token(i) = ?", token))
             .one();
+    assertThat(row).isNotNull();
     assertThat(row.getInt(0)).isEqualTo(1);
   }
 
@@ -216,6 +223,7 @@ public void should_get_token_from_row_and_set_token_in_query_with_binding_and_al
   @Test(expected = IllegalArgumentException.class)
   public void should_raise_exception_when_getting_token_on_non_token_column() {
     Row row = session().execute("SELECT i FROM foo WHERE i = 1").one();
+    assertThat(row).isNotNull();
     row.getToken(0);
   }
 
@@ -237,11 +245,13 @@ public void should_expose_consistent_ranges() {
   }
 
   private void checkRanges(Session session) {
+    assertThat(session.getMetadata().getTokenMap()).isPresent();
     TokenMap tokenMap = session.getMetadata().getTokenMap().get();
     checkRanges(tokenMap.getTokenRanges());
   }
 
   private void checkRanges(Session session, CqlIdentifier keyspace, int replicationFactor) {
+    assertThat(session.getMetadata().getTokenMap()).isPresent();
     TokenMap tokenMap = session.getMetadata().getTokenMap().get();
     List<TokenRange> allRangesWithDuplicates = Lists.newArrayList();
 
@@ -347,6 +357,7 @@ public void should_create_token_from_partition_key() {
     TokenMap tokenMap = getTokenMap();
 
     Row row = session().execute("SELECT token(i) FROM foo WHERE i = 1").one();
+    assertThat(row).isNotNull();
     Token expected = row.getToken(0);
 
     ProtocolVersion protocolVersion = session().getContext().getProtocolVersion();