Skip to content

FileStore: close the active segment before threshold compaction #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
genemichael wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −0
Open

FileStore: close the active segment before threshold compaction #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions include/microStore/FileStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,12 +1267,22 @@ USTORE_LOG("[ustore] rotate_segment_if_needed: closing active file\n");
//if (total > 0 && _dead_since_compact * 100 / total >= USTORE_COMPACT_THRESHOLD) {
if (policy_max_recs > 0 && _dead_since_compact * 100 / policy_max_recs >= USTORE_COMPACT_THRESHOLD) {
USTORE_LOG("[ustore] Compaction triggered by deleted threshold (dead=%u, max=%u)\n", _dead_since_compact, policy_max_recs);
// The active segment must be closed before compact() deletes it, as
// rotate_segment_if_needed() already does. ESP-IDF LittleFS refuses to
// unlink an open file ("Failed to unlink ... Has open FD"), which left
// the active segment in place after every threshold compaction.
flush_buffer();
if (active_file) active_file.close();
if (compact()) {
// After threshold-triggered compaction, seg0 holds the compacted data.
// Open seg1 for new writes, mirroring what rotate_segment_if_needed() does
// after a rotation-triggered compaction.
current_segment = 1;
open_segment(current_segment);
} else {
// Compaction failed or was skipped; resume appending to the segment
// that was active before.
open_segment(current_segment);
}
}
#endif
Expand Down