diff --git a/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMHarness.java b/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 5b59902..7308fd9 100644
--- a/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++ b/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -266,7 +266,7 @@
     public void flush(ILSMIndexOperationContext ctx, ILSMIOOperation operation) throws HyracksDataException,
             IndexException {
         if (LOGGER.isLoggable(Level.INFO)) {
-            LOGGER.info(lsmIndex + ": Flushing ...");
+            LOGGER.info("Started flushing index: " +  lsmIndex + " ...");
         }
 
         ILSMComponent newComponent = null;
@@ -279,6 +279,9 @@
             exitComponents(ctx, LSMOperationType.FLUSH, newComponent, false);
             operation.getCallback().afterFinalize(newComponent);
         }
+        if (LOGGER.isLoggable(Level.INFO)) {
+            LOGGER.info("Finished flushing index: " +  lsmIndex);
+        }
     }
 
     @Override
@@ -298,7 +301,7 @@
     public void merge(ILSMIndexOperationContext ctx, ILSMIOOperation operation) throws HyracksDataException,
             IndexException {
         if (LOGGER.isLoggable(Level.INFO)) {
-            LOGGER.info(lsmIndex + ": Merging ...");
+            LOGGER.info("Started merging index: " +  lsmIndex + " ...");
         }
 
         ILSMComponent newComponent = null;
@@ -311,6 +314,9 @@
             exitComponents(ctx, LSMOperationType.MERGE, newComponent, false);
             operation.getCallback().afterFinalize(newComponent);
         }
+        if (LOGGER.isLoggable(Level.INFO)) {
+            LOGGER.info("Finished merging index: " +  lsmIndex);
+        }
     }
 
     @Override
