dlg99 commented on a change in pull request #3043:
URL: https://github.com/apache/bookkeeper/pull/3043#discussion_r805082073
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
##########
@@ -400,27 +400,32 @@ public void runWithFlags(boolean force, boolean
suspendMajor, boolean suspendMin
// enter major compaction
LOG.info("Enter major compaction, suspendMajor {}",
suspendMajor);
majorCompacting.set(true);
- doCompactEntryLogs(majorCompactionThreshold,
majorCompactionMaxTimeMillis);
- lastMajorCompactionTime = System.currentTimeMillis();
- // and also move minor compaction time
- lastMinorCompactionTime = lastMajorCompactionTime;
- gcStats.getMajorCompactionCounter().inc();
- majorCompacting.set(false);
+ try {
+ doCompactEntryLogs(majorCompactionThreshold,
majorCompactionMaxTimeMillis);
+ } finally {
+ lastMajorCompactionTime = System.currentTimeMillis();
+ // and also move minor compaction time
+ lastMinorCompactionTime = lastMajorCompactionTime;
+ gcStats.getMajorCompactionCounter().inc();
+ majorCompacting.set(false);
+ }
} else if (((isForceMinorCompactionAllow && force) ||
(enableMinorCompaction
&& (force || curTime - lastMinorCompactionTime >
minorCompactionInterval)))
&& (!suspendMinor)) {
// enter minor compaction
LOG.info("Enter minor compaction, suspendMinor {}",
suspendMinor);
minorCompacting.set(true);
- doCompactEntryLogs(minorCompactionThreshold,
minorCompactionMaxTimeMillis);
- lastMinorCompactionTime = System.currentTimeMillis();
- gcStats.getMinorCompactionCounter().inc();
- minorCompacting.set(false);
- }
-
- if (force && forceGarbageCollection.compareAndSet(true, false)) {
- LOG.info("{} Set forceGarbageCollection to false after force
GC to make it forceGC-able again.",
- Thread.currentThread().getName());
+ try {
+ doCompactEntryLogs(minorCompactionThreshold,
minorCompactionMaxTimeMillis);
+ } finally {
+ lastMinorCompactionTime = System.currentTimeMillis();
+ gcStats.getMinorCompactionCounter().inc();
+ minorCompacting.set(false);
+ }
+ if (force && forceGarbageCollection.compareAndSet(true,
false)) {
Review comment:
fixed. I meant to move under finally, but under different finally.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
