This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new d048efc Don't fail all view tests because one method timed out
d048efc is described below
commit d048efccd6bcab37da33d614c802cf84bbeb62c7
Author: jacek-lewandowski <[email protected]>
AuthorDate: Tue Mar 16 05:46:16 2021 +0100
Don't fail all view tests because one method timed out
Patch by Jacek Lewandowski; reviewed by brandonwilliams for
CASSANDRA-16520
---
test/long/org/apache/cassandra/cql3/ViewLongTest.java | 18 ++++++++++++++----
.../org/apache/cassandra/cql3/ViewComplexTest.java | 18 ++++++++++++++----
.../unit/org/apache/cassandra/cql3/ViewSchemaTest.java | 18 ++++++++++++++----
test/unit/org/apache/cassandra/cql3/ViewTest.java | 18 ++++++++++++++----
4 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/test/long/org/apache/cassandra/cql3/ViewLongTest.java
b/test/long/org/apache/cassandra/cql3/ViewLongTest.java
index 7102649..3a69e11 100644
--- a/test/long/org/apache/cassandra/cql3/ViewLongTest.java
+++ b/test/long/org/apache/cassandra/cql3/ViewLongTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
+import com.datastax.driver.core.exceptions.OperationTimedOutException;
import com.datastax.driver.core.exceptions.WriteTimeoutException;
import org.apache.cassandra.batchlog.BatchlogManager;
import org.apache.cassandra.concurrent.NamedThreadFactory;
@@ -67,10 +68,19 @@ public class ViewLongTest extends CQLTester
private void createView(String name, String query) throws Throwable
{
- executeNet(protocolVersion, String.format(query, name));
- // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
- // the desired behavior
- views.add(name);
+ try
+ {
+ executeNet(protocolVersion, String.format(query, name));
+ // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
+ // the desired behavior
+ views.add(name);
+ }
+ catch (OperationTimedOutException ex)
+ {
+ // ... except for timeout, when we actually do not know whether
the view was created or not
+ views.add(name);
+ throw ex;
+ }
}
@Test
diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
index fb84168..e6a790a 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import com.datastax.driver.core.exceptions.OperationTimedOutException;
import org.apache.cassandra.concurrent.SEPExecutor;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.db.ColumnFamilyStore;
@@ -74,10 +75,19 @@ public class ViewComplexTest extends CQLTester
private void createView(String name, String query) throws Throwable
{
- executeNet(protocolVersion, String.format(query, name));
- // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
- // the desired behavior
- views.add(name);
+ try
+ {
+ executeNet(protocolVersion, String.format(query, name));
+ // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
+ // the desired behavior
+ views.add(name);
+ }
+ catch (OperationTimedOutException ex)
+ {
+ // ... except for timeout, when we actually do not know whether
the view was created or not
+ views.add(name);
+ throw ex;
+ }
}
private void updateView(String query, Object... params) throws Throwable
diff --git a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java
b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java
index 2dcfe32..0323b49 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java
@@ -31,6 +31,7 @@ import java.util.UUID;
import org.junit.Assert;
+import com.datastax.driver.core.exceptions.OperationTimedOutException;
import org.apache.cassandra.concurrent.SEPExecutor;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.schema.ColumnMetadata;
@@ -74,10 +75,19 @@ public class ViewSchemaTest extends CQLTester
private void createView(String name, String query) throws Throwable
{
- executeNet(protocolVersion, String.format(query, name));
- // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
- // the desired behavior
- views.add(name);
+ try
+ {
+ executeNet(protocolVersion, String.format(query, name));
+ // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
+ // the desired behavior
+ views.add(name);
+ }
+ catch (OperationTimedOutException ex)
+ {
+ // ... except for timeout, when we actually do not know whether
the view was created or not
+ views.add(name);
+ throw ex;
+ }
}
private void updateView(String query, Object... params) throws Throwable
diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java
b/test/unit/org/apache/cassandra/cql3/ViewTest.java
index b8939ce..f792cfd 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.exceptions.InvalidQueryException;
+import com.datastax.driver.core.exceptions.OperationTimedOutException;
import org.apache.cassandra.concurrent.SEPExecutor;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -76,10 +77,19 @@ public class ViewTest extends CQLTester
private void createView(String name, String query) throws Throwable
{
- executeNet(protocolVersion, String.format(query, name));
- // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
- // the desired behavior
- views.add(name);
+ try
+ {
+ executeNet(protocolVersion, String.format(query, name));
+ // If exception is thrown, the view will not be added to the list;
since it shouldn't have been created, this is
+ // the desired behavior
+ views.add(name);
+ }
+ catch (OperationTimedOutException ex)
+ {
+ // ... except for timeout, when we actually do not know whether
the view was created or not
+ views.add(name);
+ throw ex;
+ }
}
private void updateView(String query, Object... params) throws Throwable
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
