svn commit: r979492 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java

[jbellis]

Author: jbellis
Date: Tue Jul 27 01:45:19 2010
New Revision: 979492

URL: http://svn.apache.org/viewvc?rev=979492&view=rev
Log:
clarify that DME is not expected after data-only reads are issued.  patch by 
jbellis

Modified:
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java?rev=979492&r1=979491&r2=979492&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
 Tue Jul 27 01:45:19 2010
@@ -502,7 +502,7 @@ public class StorageProxy implements Sto
                     int responseCount = 
determineBlockFor(DatabaseDescriptor.getReplicationFactor(command.table), 
consistency_level);
                     IResponseResolver<Row> readResponseResolverRepair = new 
ReadResponseResolver(command.table, responseCount);
                     QuorumResponseHandler<Row> quorumResponseHandlerRepair = 
new QuorumResponseHandler<Row>(responseCount, readResponseResolverRepair);
-                    logger.info("DigestMismatchException: " + ex.getMessage());
+                    logger.debug("Digest mismatch; requesting full data from 
each replica");
                     Message messageRepair = command.makeReadMessage();
                     MessagingService.instance.sendRR(messageRepair, 
commandEndPoints.get(commandIndex), quorumResponseHandlerRepair);
                     try
@@ -513,8 +513,7 @@ public class StorageProxy implements Sto
                     }
                     catch (DigestMismatchException e)
                     {
-                        // TODO should this be a thrift exception?
-                        throw new RuntimeException("digest mismatch reading 
key " + command.key, e);
+                        throw new AssertionError(e); // full data requested 
from each node here, no digests should be sent
                     }
                 }
             }