You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/04/27 02:08:06 UTC

svn commit: r938272 - /cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java

Author: jbellis
Date: Tue Apr 27 00:08:06 2010
New Revision: 938272

URL: http://svn.apache.org/viewvc?rev=938272&view=rev
Log:
improve DEBUG logging of insert path.  patch by Ryan King and jbellis for CASSANDRA-1023

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=938272&r1=938271&r2=938272&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Tue Apr 27 00:08:06 2010
@@ -123,7 +123,7 @@ public class StorageProxy implements Sto
                             if (destination.equals(FBUtilities.getLocalAddress()))
                             {
                                 if (logger.isDebugEnabled())
-                                    logger.debug("insert writing local key " + rm.key());
+                                    logger.debug("insert writing local key " + FBUtilities.bytesToHex(rm.key()) + " (keyspace: " + rm.getTable() + ", CFs:" + rm.columnFamilyNames() + ")");
                                 Runnable runnable = new WrappedRunnable()
                                 {
                                     public void runMayThrow() throws IOException
@@ -138,7 +138,7 @@ public class StorageProxy implements Sto
                                 if (unhintedMessage == null)
                                     unhintedMessage = rm.makeRowMutationMessage();
                                 if (logger.isDebugEnabled())
-                                    logger.debug("insert writing key " + rm.key() + " to " + unhintedMessage.getMessageId() + "@" + destination);
+                                    logger.debug("insert writing key " + FBUtilities.bytesToHex(rm.key()) + " to " + unhintedMessage.getMessageId() + "@" + destination);
                                 MessagingService.instance.sendOneWay(unhintedMessage, destination);
                             }
                         }
@@ -152,7 +152,7 @@ public class StorageProxy implements Sto
                                 {
                                     addHintHeader(hintedMessage, target);
                                     if (logger.isDebugEnabled())
-                                        logger.debug("insert writing key " + rm.key() + " to " + hintedMessage.getMessageId() + "@" + destination + " for " + target);
+                                        logger.debug("insert writing key " + FBUtilities.bytesToHex(rm.key()) + " to " + hintedMessage.getMessageId() + "@" + destination + " for " + target);
                                 }
                             }
                             MessagingService.instance.sendOneWay(hintedMessage, destination);
@@ -161,7 +161,7 @@ public class StorageProxy implements Sto
                 }
                 catch (IOException e)
                 {
-                    throw new RuntimeException("error inserting key " + rm.key(), e);
+                    throw new RuntimeException("error inserting key " + FBUtilities.bytesToHex(rm.key()), e);
                 }
             }
         }
@@ -226,7 +226,7 @@ public class StorageProxy implements Sto
                                 MessagingService.instance.addCallback(responseHandler, unhintedMessage.getMessageId());
                             }
                             if (logger.isDebugEnabled())
-                                logger.debug("insert writing key " + rm.key() + " to " + unhintedMessage.getMessageId() + "@" + destination);
+                                logger.debug("insert writing key " + FBUtilities.bytesToHex(rm.key()) + " to " + unhintedMessage.getMessageId() + "@" + destination);
                             MessagingService.instance.sendOneWay(unhintedMessage, destination);
                         }
                     }
@@ -240,7 +240,7 @@ public class StorageProxy implements Sto
                             {
                                 addHintHeader(hintedMessage, target);
                                 if (logger.isDebugEnabled())
-                                    logger.debug("insert writing key " + rm.key() + " to " + hintedMessage.getMessageId() + "@" + destination + " for " + target);
+                                    logger.debug("insert writing key " + FBUtilities.bytesToHex(rm.key()) + " to " + hintedMessage.getMessageId() + "@" + destination + " for " + target);
                             }
                         }
                         // (non-destination hints are part of the callback and count towards consistency only under CL.ANY)
@@ -261,7 +261,7 @@ public class StorageProxy implements Sto
             if (mostRecentRowMutation == null)
                 throw new RuntimeException("no mutations were seen but found an error during write anyway", e);
             else
-                throw new RuntimeException("error writing key " + mostRecentRowMutation.key(), e);
+                throw new RuntimeException("error writing key " + FBUtilities.bytesToHex(mostRecentRowMutation.key()), e);
         }
         finally
         {
@@ -296,7 +296,7 @@ public class StorageProxy implements Sto
     private static void insertLocalMessage(final RowMutation rm, final WriteResponseHandler responseHandler)
     {
         if (logger.isDebugEnabled())
-            logger.debug("insert writing local key " + rm.key());
+            logger.debug("insert writing local key " + FBUtilities.bytesToHex(rm.key()) + " (keyspace: " + rm.getTable() + ", CFs:" + rm.columnFamilyNames() + ")");
         Runnable runnable = new WrappedRunnable()
         {
             public void runMayThrow() throws IOException
@@ -502,7 +502,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 RuntimeException("digest mismatch reading key " + FBUtilities.bytesToHex(command.key), e);
                     }
                 }
             }