cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/3] git commit: Fix tracing of local portions of range slices
Date Fri, 25 Jul 2014 18:27:12 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk a09f36354 -> b5f8bd2af


Fix tracing of local portions of range slices

Patch by Tyler Hobbs; review by Brandon Williams for CASSANDRA-7599


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/638c40e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/638c40e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/638c40e8

Branch: refs/heads/trunk
Commit: 638c40e817a0d4c4e52956491b99c2699bedc80c
Parents: 9082281
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Fri Jul 25 13:25:35 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Fri Jul 25 13:25:35 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1278c56..4e0284b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
  * Use "keyspace updated" schema change message for UDT changes in v1 and
    v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+   to the coordinator (CASSANDRA-7599)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 9eae17a..65ce413 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1405,7 +1405,7 @@ public class StorageProxy implements StorageProxyMBean
 
         LocalRangeSliceRunnable(AbstractRangeCommand command, ReadCallback<RangeSliceReply,
Iterable<Row>> handler)
         {
-            super(MessagingService.Verb.READ);
+            super(MessagingService.Verb.RANGE_SLICE);
             this.command = command;
             this.handler = handler;
         }
@@ -1590,7 +1590,7 @@ public class StorageProxy implements StorageProxyMBean
                         && filteredEndpoints.get(0).equals(FBUtilities.getBroadcastAddress())
                         && OPTIMIZE_LOCAL_REQUESTS)
                     {
-                        StageManager.getStage(Stage.READ).execute(new LocalRangeSliceRunnable(nodeCmd,
handler));
+                        StageManager.getStage(Stage.READ).execute(new LocalRangeSliceRunnable(nodeCmd,
handler), Tracing.instance.get());
                     }
                     else
                     {


Mime
View raw message