Author: jbellis
Date: Mon Oct 12 19:57:40 2009
New Revision: 824474
URL: http://svn.apache.org/viewvc?rev=824474&view=rev
Log:
logging & cleanup in ConsistencyManager
patch by jbellis for CASSANDRA-478
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java?rev=824474&r1=824473&r2=824474&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java Mon Oct
12 19:57:40 2009
@@ -199,7 +199,7 @@
public String toString()
{
- return "Row(" + key_ + " [" +
StringUtils.join(columnFamilies_.values(), ", ") + ")]";
+ return "Row(" + key_ + " [" +
StringUtils.join(columnFamilies_.values(), ", ") + "])";
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java?rev=824474&r1=824473&r2=824474&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
Mon Oct 12 19:57:40 2009
@@ -46,14 +46,14 @@
class DigestResponseHandler implements IAsyncCallback
{
List<Message> responses_ = new ArrayList<Message>();
-
+
public synchronized void response(Message msg)
{
responses_.add(msg);
- if ( responses_.size() ==
ConsistencyManager.this.replicas_.size() )
- handleDigestResponses();
- }
-
+ if (responses_.size() == ConsistencyManager.this.replicas_.size())
+ handleDigestResponses();
+ }
+
public void attachContext(Object o)
{
throw new UnsupportedOperationException("This operation is not
currently supported.");
@@ -61,27 +61,27 @@
private void handleDigestResponses()
{
- DataInputBuffer bufIn = new DataInputBuffer();
- for( Message response : responses_ )
- {
- byte[] body = response.getMessageBody();
- bufIn.reset(body, body.length);
- try
- {
- ReadResponse result =
ReadResponse.serializer().deserialize(bufIn);
- byte[] digest = result.digest();
- if( !Arrays.equals(row_.digest(), digest) )
- {
- doReadRepair();
- break;
- }
- }
- catch( IOException ex )
- {
- logger_.info(LogUtil.throwableToString(ex));
- }
- }
- }
+ DataInputBuffer bufIn = new DataInputBuffer();
+ for (Message response : responses_)
+ {
+ try
+ {
+ byte[] body = response.getMessageBody();
+ bufIn.reset(body, body.length);
+ ReadResponse result =
ReadResponse.serializer().deserialize(bufIn);
+ byte[] digest = result.digest();
+ if (!Arrays.equals(row_.digest(), digest))
+ {
+ doReadRepair();
+ break;
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Error handling responses for "
+ row_, e);
+ }
+ }
+ }
private void doReadRepair() throws IOException
{
@@ -114,12 +114,12 @@
if (logger_.isDebugEnabled())
logger_.debug("Received responses in
DataRepairHandler : " + message.toString());
responses_.add(message);
- if ( responses_.size() == majority_ )
- {
- String messageId = message.getMessageId();
- readRepairTable_.put(messageId, messageId,
this);
- }
- }
+ if (responses_.size() == majority_)
+ {
+ String messageId = message.getMessageId();
+ readRepairTable_.put(messageId, messageId, this);
+ }
+ }
public void attachContext(Object o)
{
