diff options
| author | Dan Engelbrecht <[email protected]> | 2023-11-08 15:51:40 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-08 15:51:40 +0100 |
| commit | 48d14dee059c97ead3897acf8bea9a80d6761a6e (patch) | |
| tree | 2e82ad1b0dbec7464f7653a0f9613b3c6120c3c4 | |
| parent | disk layer gc and error/warnings cleanup (#515) (diff) | |
| download | zen-48d14dee059c97ead3897acf8bea9a80d6761a6e.tar.xz zen-48d14dee059c97ead3897acf8bea9a80d6761a6e.zip | |
don't try to close NewBlockFile if it hasn't been created (#523)
* Don't try to close NewBlockFile if it hasn't been created
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zenstore/blockstore.cpp | 2 |
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; } |