diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
index affcbee..d606300 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
@@ -182,6 +182,29 @@ public class LuceneIndexEditorContext {
         return writer;
     }
 
+    private void trackIndexSizeInfo() throws IOException {
+        int docs = writer.numDocs();
+        int ram = writer.numRamDocs();
+
+        log.trace("Writer for direcory {} - docs: {}, ramDocs: {}", definition, docs, ram);
+        
+        String[] files = directory.listAll();
+        long overallSize = 0;
+        StringBuilder sb = new StringBuilder();
+        for (String f : files) {
+            sb.append(f).append(":");
+            if (directory.fileExists(f)) {
+                long size = directory.fileLength(f);
+                overallSize += size;
+                sb.append(size);
+            } else {
+                sb.append("--");
+            }
+            sb.append(", ");
+        }
+        log.trace("Directory overall size: {}, files: {}", overallSize, sb.toString());
+    }
+    
     /**
      * close writer if it's not null
      */
@@ -195,12 +218,20 @@ public class LuceneIndexEditorContext {
         }
 
         if (writer != null) {
+            if (log.isTraceEnabled()) {
+                trackIndexSizeInfo();
+            }
+
             final long start = PERF_LOGGER.start();
+            
             updateSuggester();
+            PERF_LOGGER.end(start, -1, "Completed suggester for directory {}", definition);
             
             writer.close();
+            PERF_LOGGER.end(start, -1, "Closed writer for directory {}", definition);
 
             directory.close();
+            PERF_LOGGER.end(start, -1, "Closed directory for directory {}", definition);
 
             //OAK-2029 Record the last updated status so
             //as to make IndexTracker detect changes when index
@@ -208,7 +239,7 @@ public class LuceneIndexEditorContext {
             NodeBuilder status = definitionBuilder.child(":status");
             status.setProperty("lastUpdated", ISO8601.format(Calendar.getInstance()), Type.DATE);
             status.setProperty("indexedNodes",indexedNodes);
-            PERF_LOGGER.end(start, -1, "Closed IndexWriter for directory {}", definition);
+            PERF_LOGGER.end(start, -1, "Overall Closed IndexWriter for directory {}", definition);
 
             textExtractionStats.log(reindex);
             textExtractionStats.collectStats(extractedTextCache);