svn commit: r1814566 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicy.java

[tommaso]

Author: tommaso
Date: Wed Nov  8 10:27:41 2017
New Revision: 1814566

URL: http://svn.apache.org/viewvc?rev=1814566&view=rev
Log:
OAK-6710 - more debug logs for stats and mitigations

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicy.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicy.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicy.java?rev=1814566&r1=1814565&r2=1814566&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicy.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicy.java
 Wed Nov  8 10:27:41 2017
@@ -404,7 +404,7 @@ public class CommitMitigatingTieredMerge
 
         avgCommitRateDocs = singleExpSmoothing(commitRate, avgCommitRateDocs);
 
-        log.debug("commit rate: current {}, average {} docs/sec", commitRate, 
avgCommitRateDocs);
+        log.debug("commit rate: current {}, average {}, max {} docs/sec", 
commitRate, avgCommitRateDocs, maxCommitRateDocs);
 
         docCount = infos.totalDocCount();
 
@@ -414,6 +414,8 @@ public class CommitMitigatingTieredMerge
 
         // do not mitigate if there're too many segments to avoid affecting 
performance
         if (commitRate > maxCommitRateDocs && segmentSize < 
maxNoOfSegsForMitigation) {
+            log.debug("mitigation due to {} > {} docs/sec and segments {} < 
{})", commitRate, maxCommitRateDocs,
+                    segmentSize, maxNoOfSegsForMitigation);
             return null;
         }
 
@@ -490,7 +492,7 @@ public class CommitMitigatingTieredMerge
                 }
                 idxBytes += info.sizeInBytes();
             }
-            idxBytes /= 1024 * 1000;
+            idxBytes /= 1024d * 1024d;
 
             final boolean maxMergeIsRunning = mergingBytes >= 
maxMergedSegmentBytes;
 
@@ -507,7 +509,7 @@ public class CommitMitigatingTieredMerge
 
             avgCommitRateMB = singleExpSmoothing(mbRate, avgCommitRateMB);
 
-            log.debug("commit rate: current {}, average {} MB/sec", mbRate, 
avgCommitRateMB);
+            log.debug("commit rate: current {}, average {}, max {} MB/sec", 
mbRate, avgCommitRateMB, maxCommitRateMB);
 
             if (verbose()) {
                 message(mbRate + "mb/s (max: " + maxCommitRateMB + ", avg: " + 
avgCommitRateMB + " MB/s)");
@@ -517,6 +519,8 @@ public class CommitMitigatingTieredMerge
 
             // do not mitigate if there're too many segments to avoid 
affecting performance
             if (mbRate > maxCommitRateMB && segmentSize < 
maxNoOfSegsForMitigation) {
+                log.debug("mitigation due to {} > {} MB/sec and segments {} < 
{})", mbRate, maxCommitRateMB,
+                        segmentSize, maxNoOfSegsForMitigation);
                 return null;
             }