cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: Revert "More detailed read repair metrics."
Date Thu, 06 Jun 2013 03:16:55 GMT
Updated Branches:
  refs/heads/trunk b4b30cf87 -> 4c0be33ea


Revert "More detailed read repair metrics."

This reverts commit b4b30cf87cbf3f7957c64f625f0f90d24b43b49c.


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

Branch: refs/heads/trunk
Commit: 1c038f50446e4ee0da23bb86a032e591e1899265
Parents: b4b30cf
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Jun 5 22:10:32 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Jun 5 22:10:32 2013 -0500

----------------------------------------------------------------------
 .../cassandra/service/AbstractReadExecutor.java    |   11 +----------
 .../org/apache/cassandra/service/StorageProxy.java |    5 +----
 .../cassandra/service/StorageProxyMBean.java       |    2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c038f50/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index f944507..1c7c6f9 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -25,7 +25,6 @@ import org.apache.cassandra.concurrent.Stage;
 import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.Schema;
-import org.apache.cassandra.config.ReadRepairDecision;
 import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.ConsistencyLevel;
 import org.apache.cassandra.db.ReadCommand;
@@ -34,7 +33,6 @@ import org.apache.cassandra.db.Row;
 import org.apache.cassandra.db.Table;
 import org.apache.cassandra.exceptions.ReadTimeoutException;
 import org.apache.cassandra.exceptions.UnavailableException;
-import org.apache.cassandra.metrics.ReadRepairMetrics;
 import org.apache.cassandra.net.MessageOut;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageProxy.LocalReadRunnable;
@@ -127,14 +125,7 @@ public abstract class AbstractReadExecutor
         Table table = Table.open(command.table);
         List<InetAddress> allReplicas = StorageProxy.getLiveSortedEndpoints(table,
command.key);
         CFMetaData metaData = Schema.instance.getCFMetaData(command.table, command.cfName);
-
-        ReadRepairDecision rrDecision = metaData.newReadRepairDecision();
-         
-        if (rrDecision != ReadRepairDecision.NONE) {
-            ReadRepairMetrics.attempted.mark();
-        }
-
-        List<InetAddress> queryTargets = consistency_level.filterForQuery(table, allReplicas,
rrDecision);
+        List<InetAddress> queryTargets = consistency_level.filterForQuery(table, allReplicas,
metaData.newReadRepairDecision());
 
         if (StorageService.instance.isClientMode())
         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c038f50/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 62e4d86..852e8ca 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1247,6 +1247,7 @@ public class StorageProxy implements StorageProxyMBean
                     logger.trace("Digest mismatch: {}", ex);
                     
                     ReadRepairMetrics.repairedBlocking.mark();
+                    
                     // Do a full data read to resolve the correct response (and repair node
that need be)
                     RowDataResolver resolver = new RowDataResolver(exec.command.table, exec.command.key,
exec.command.filter());
                     ReadCallback<ReadResponse, Row> repairHandler = exec.handler.withNewResolver(resolver);
@@ -1990,10 +1991,6 @@ public class StorageProxy implements StorageProxyMBean
     public Long getTruncateRpcTimeout() { return DatabaseDescriptor.getTruncateRpcTimeout();
}
     public void setTruncateRpcTimeout(Long timeoutInMillis) { DatabaseDescriptor.setTruncateRpcTimeout(timeoutInMillis);
}
     public void reloadTriggerClass() { TriggerExecutor.instance.reloadClasses(); }
-<<<<<<< HEAD
-=======
-
->>>>>>> More detailed read repair metrics.
     
     public long getReadRepairAttempted() {
         return ReadRepairMetrics.attempted.count();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c038f50/src/java/org/apache/cassandra/service/StorageProxyMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxyMBean.java b/src/java/org/apache/cassandra/service/StorageProxyMBean.java
index 32fa1be..3cb4f17 100644
--- a/src/java/org/apache/cassandra/service/StorageProxyMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageProxyMBean.java
@@ -92,7 +92,7 @@ public interface StorageProxyMBean
     public void setTruncateRpcTimeout(Long timeoutInMillis);
 
     public void reloadTriggerClass();
-
+    
     public long getReadRepairAttempted();
     public long getReadRepairRepairedBlocking();
     public long getReadRepairRepairedBackground();


Mime
View raw message