cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Stefania (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (CASSANDRA-10951) Fix ReadCommandTest
Date Wed, 06 Jan 2016 16:58:39 GMT

    [ https://issues.apache.org/jira/browse/CASSANDRA-10951?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15085830#comment-15085830
] 

Stefania commented on CASSANDRA-10951:
--------------------------------------

I think there maybe a typo in {{AbortedQueriesTester}}: get rid of "Some" in "Some operations
timed out", all 4 tests.

With that it was working for me, at least locally, although my patch was slightly different:

{code}
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 959085b..4ba2f7e 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -31,6 +31,8 @@ import org.apache.cassandra.db.filter.*;
 import org.apache.cassandra.db.monitoring.MonitorableImpl;
 import org.apache.cassandra.db.partitions.*;
 import org.apache.cassandra.db.rows.*;
+import org.apache.cassandra.db.transform.BasePartitions;
+import org.apache.cassandra.db.transform.BaseRows;
 import org.apache.cassandra.db.transform.StoppingTransformation;
 import org.apache.cassandra.db.transform.Transformation;
 import org.apache.cassandra.dht.AbstractBounds;
@@ -497,6 +499,20 @@ public abstract class ReadCommand extends MonitorableImpl implements
ReadQuery
             if (TEST_ITERATION_DELAY_MILLIS > 0)
                 maybeDelayForTesting();
         }
+
+        @Override
+        protected void attachTo(BasePartitions partitions)
+        {
+            super.attachTo(partitions);
+            maybeAbort();
+        }
+
+        @Override
+        protected void attachTo(BaseRows rows)
+        {
+            super.attachTo(rows);
+            maybeAbort();
+        }
     }
 
     protected UnfilteredPartitionIterator withStateTracking(UnfilteredPartitionIterator iter)
{code}

The stop information is attached to the row/partition so I simply made sure to abort when
attaching as well.

I would happily review this but I will be OOO for the next two days.

> Fix ReadCommandTest
> -------------------
>
>                 Key: CASSANDRA-10951
>                 URL: https://issues.apache.org/jira/browse/CASSANDRA-10951
>             Project: Cassandra
>          Issue Type: Bug
>          Components: Local Write-Read Paths, Testing
>            Reporter: Yuki Morishita
>            Assignee: Branimir Lambov
>            Priority: Blocker
>             Fix For: 3.2
>
>
> [ReadCommandTest is failing|http://cassci.datastax.com/view/trunk/job/trunk_testall/641/testReport/org.apache.cassandra.db/ReadCommandTest/history/]
since CASSANDRA-9975 was merged to trunk.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message