Author: mduerig
Date: Thu Sep 7 20:42:10 2017
New Revision: 1807648
URL: http://svn.apache.org/viewvc?rev=1807648&view=rev
Log:
OAK-6634: Confusing log entries when memory requirements are not met at start
of OnRC
Add an extra check for sufficient memory to avoid duplicate logging
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1807648&r1=1807647&r2=1807648&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Thu Sep 7 20:42:10 2017
@@ -638,10 +638,14 @@ public class FileStore extends AbstractF
}
if (sufficientEstimatedGain) {
- if (!gcOptions.isPaused()) {
- try (GCMemoryBarrier gcMemoryBarrier = new
GCMemoryBarrier(
- sufficientMemory, gcListener, GC_COUNT.get(),
gcOptions))
- {
+ try (GCMemoryBarrier gcMemoryBarrier = new GCMemoryBarrier(
+ sufficientMemory, gcListener, GC_COUNT.get(),
gcOptions))
+ {
+ if (gcOptions.isPaused()) {
+ gcListener.skipped("TarMK GC #{}: compaction
paused", GC_COUNT);
+ } else if (!sufficientMemory.get()) {
+ gcListener.skipped("TarMK GC #{}: compaction
skipped. Not enough memory", GC_COUNT);
+ } else {
CompactionResult compactionResult = compact.get();
if (compactionResult.isSuccess()) {
lastSuccessfullGC = System.currentTimeMillis();
@@ -650,8 +654,6 @@ public class FileStore extends AbstractF
}
fileReaper.add(cleanup(compactionResult));
}
- } else {
- gcListener.skipped("TarMK GC #{}: compaction paused",
GC_COUNT);
}
}
} finally {
