From a518fb396c0a5f7b9301467f26b5d3bd8c836610 Mon Sep 17 00:00:00 2001
From: Calvin Jia <jia.calvin@gmail.com>
Date: Tue, 4 Aug 2015 17:16:57 -0700
Subject: [PATCH] Clean up some of the logging.

---
 .../src/main/java/tachyon/worker/block/BlockLockManager.java | 5 +++--
 .../src/main/java/tachyon/worker/block/BlockMasterSync.java  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/servers/src/main/java/tachyon/worker/block/BlockLockManager.java b/servers/src/main/java/tachyon/worker/block/BlockLockManager.java
index 9156828b2547..d9d988374175 100644
--- a/servers/src/main/java/tachyon/worker/block/BlockLockManager.java
+++ b/servers/src/main/java/tachyon/worker/block/BlockLockManager.java
@@ -107,8 +107,9 @@ public long lockBlock(long userId, long blockId, BlockLockType blockLockType) th
       throw new IOException(ie.getMessage(), ie.getCause());
     }
     if (!success) {
-      LOG.error("Failed to lockBlock: " + blockId + " for user: " + userId + " in 1s.");
-      throw new IOException("Failed to lockBlock: " + blockId + " for user: " + userId + " in 1s.");
+      String errMsg = "Failed to lockBlock: " + blockId + " for user: " + userId + " in 5ms.";
+      LOG.error(errMsg);
+      throw new IOException(errMsg);
     }
     if (!mMetaManager.hasBlockMeta(blockId)) {
       lock.unlock();
diff --git a/servers/src/main/java/tachyon/worker/block/BlockMasterSync.java b/servers/src/main/java/tachyon/worker/block/BlockMasterSync.java
index 383935ad198a..6fc1acb78a62 100644
--- a/servers/src/main/java/tachyon/worker/block/BlockMasterSync.java
+++ b/servers/src/main/java/tachyon/worker/block/BlockMasterSync.java
@@ -197,7 +197,7 @@ private void handleMasterCommand(Command cmd) throws IOException {
           try {
             mBlockDataManager.removeBlock(Users.MASTER_COMMAND_USER_ID, block);
           } catch (IOException ioe) {
-            LOG.warn("Failed to delete block instructed by master due to concurrent read.");
+            LOG.warn("Failed master delete block cmd for: " + block + " due to concurrent read.");
           }
         }
         break;