More cleanup# with '#' will be ignored, and an empty message aborts t…

…he commit.
mfr0st · Apr 24, 2013 · 6b5f854 · 6b5f854
1 parent aefddee
commit 6b5f854
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/java/voldemort/client/protocol/admin/StreamingClient.java b/src/java/voldemort/client/protocol/admin/StreamingClient.java
@@ -503,8 +503,8 @@ public synchronized void streamingPut(ByteArray key, Versioned<byte[]> value, St
                     throw new VoldemortException("Recovery Callback failed");
                 } catch(ExecutionException e1) {
                     MARKED_BAD = true;
-                    logger.error("Recovery Callback failed", e1);
-                    throw new VoldemortException("Recovery Callback failed");
+                    logger.error("Recovery Callback failed during execution", e1);
+                    throw new VoldemortException("Recovery Callback failed during execution");
                 }
 
                 e.printStackTrace();
@@ -632,8 +632,8 @@ private void commitToVoldemort(List<String> storeNamesToCommit) {
                 throw new VoldemortException("Recovery Callback failed");
             } catch(ExecutionException e1) {
                 MARKED_BAD = true;
-                logger.error("Recovery Callback failed", e1);
-                throw new VoldemortException("Recovery Callback failed");
+                logger.error("Recovery Callback failed during execution", e1);
+                throw new VoldemortException("Recovery Callback failed during execution");
             }
         } else {
             if(logger.isDebugEnabled()) {
@@ -645,12 +645,9 @@ private void commitToVoldemort(List<String> storeNamesToCommit) {
                 future.get();
 
             } catch(InterruptedException e1) {
-
                 logger.warn("Checkpoint callback failed!", e1);
-
             } catch(ExecutionException e1) {
-                logger.warn("Checkpoint callback failed!", e1);
-
+                logger.warn("Checkpoint callback failed during execution!", e1);
             }
         }
 
@@ -674,7 +671,7 @@ public synchronized void closeStreamingSessions(Callable resetCheckpointCallback
         } catch(InterruptedException e1) {
             logger.warn("Reset check point interrupted" + e1);
         } catch(ExecutionException e1) {
-            logger.warn("Reset check point interrupted" + e1);
+            logger.warn("Reset check point interrupted during execution" + e1);
         }
     }