Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 10036 invoked from network); 27 Jul 2010 01:46:13 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Jul 2010 01:46:13 -0000 Received: (qmail 55846 invoked by uid 500); 27 Jul 2010 01:46:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55826 invoked by uid 500); 27 Jul 2010 01:46:12 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 55818 invoked by uid 99); 27 Jul 2010 01:46:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jul 2010 01:46:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jul 2010 01:46:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CC5E23889B6; Tue, 27 Jul 2010 01:45:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r979492 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java Date: Tue, 27 Jul 2010 01:45:19 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100727014519.7CC5E23889B6@eris.apache.org> 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 readResponseResolverRepair = new ReadResponseResolver(command.table, responseCount); QuorumResponseHandler quorumResponseHandlerRepair = new QuorumResponseHandler(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 } } }