aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zenstore/blockstore.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1018afdd5..21dc94c27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
- Bugfix: Corrected total disk size usage in block store
- Bugfix: Server log files were using the wrong log line prefix due to a mistake when consolidating logging setup code
- Bugfix: Sponsor processes are now registered synchronously at startup, to close potential race condition in very short-lived subprocesses such as the automated tests
+- Bugfix: Fix error in GC when reclaiming disk reserve is not enough to accommodate the new block
- Improvement: Multithread init and flush of cache bucket for faster startup and exit
- Improvement: Renamed BlockStoreCompactState::AddBlock to BlockStoreCompactState::IncludeBlock for clarity
- Improvement: Added tests for BlockStore::CompactBlocks
diff --git a/src/zenstore/blockstore.cpp b/src/zenstore/blockstore.cpp
index 30a659784..063d38707 100644
--- a/src/zenstore/blockstore.cpp
+++ b/src/zenstore/blockstore.cpp
@@ -1096,7 +1096,7 @@ BlockStore::CompactBlocks(const BlockStoreCompactState& CompactState,
ZEN_ASSERT(m_ChunkBlocks[NextBlockIndex] == NewBlockFile);
m_ChunkBlocks.erase(NextBlockIndex);
}
- NewBlockFile->MarkAsDeleteOnClose();
+ NewBlockFile = nullptr;
return;
}