diff options
| author | Dan Engelbrecht <[email protected]> | 2022-05-02 11:26:58 +0200 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-05-02 11:26:58 +0200 |
| commit | 2c340516747cf666ee18a7ffad731c06cdb2ecb6 (patch) | |
| tree | 555c0e36238684b1d10ab2629a395f0c5688a9a8 | |
| parent | restore cg comment (diff) | |
| download | zen-2c340516747cf666ee18a7ffad731c06cdb2ecb6.tar.xz zen-2c340516747cf666ee18a7ffad731c06cdb2ecb6.zip | |
Don't use "GC" term in block store
| -rw-r--r-- | zenstore/blockstore.cpp | 4 | ||||
| -rw-r--r-- | zenstore/include/zenstore/blockstore.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/zenstore/blockstore.cpp b/zenstore/blockstore.cpp index fd54e7291..d293eb97d 100644 --- a/zenstore/blockstore.cpp +++ b/zenstore/blockstore.cpp @@ -280,7 +280,7 @@ BlockStore::ReclaimSpace(const ReclaimSnapshotState& Snapshot, uint64_t PayloadAlignment, bool DryRun, const ReclaimCallback& ChangeCallback, - const ClaimGCReserveCallback& GcReserveCallback) + const ClaimDiskReserveCallback& DiskReserveCallback) { if (ChunkLocations.empty()) { @@ -513,7 +513,7 @@ BlockStore::ReclaimSpace(const ReclaimSnapshotState& Snapshot, } if (Space.Free < m_MaxBlockSize) { - uint64_t ReclaimedSpace = GcReserveCallback(); + uint64_t ReclaimedSpace = DiskReserveCallback(); if (Space.Free + ReclaimedSpace < m_MaxBlockSize) { ZEN_WARN("garbage collect for '{}' FAILED, required disk space {}, free {}", diff --git a/zenstore/include/zenstore/blockstore.h b/zenstore/include/zenstore/blockstore.h index 53bcf72db..4a1642413 100644 --- a/zenstore/include/zenstore/blockstore.h +++ b/zenstore/include/zenstore/blockstore.h @@ -122,7 +122,7 @@ public: typedef std::vector<size_t> ChunkIndexArray; typedef std::function<void(const MovedChunksArray& MovedChunks, const ChunkIndexArray& RemovedChunks)> ReclaimCallback; - typedef std::function<uint64_t()> ClaimGCReserveCallback; + typedef std::function<uint64_t()> ClaimDiskReserveCallback; typedef std::function<void(const BlockStoreLocation& Location)> WriteChunkCallback; typedef std::function<void(size_t ChunkIndex, const void* Data, uint64_t Size)> IterateChunksSmallSizeCallback; typedef std::function<void(size_t ChunkIndex, BasicFile& BlockFile, uint64_t Offset, uint64_t Size)> IterateChunksLargeSizeCallback; @@ -149,8 +149,8 @@ public: const ChunkIndexArray& KeepChunkIndexes, uint64_t PayloadAlignment, bool DryRun, - const ReclaimCallback& ChangeCallback = [](const MovedChunksArray&, const ChunkIndexArray&) {}, - const ClaimGCReserveCallback& GcReserveCallback = []() { return 0; }); + const ReclaimCallback& ChangeCallback = [](const MovedChunksArray&, const ChunkIndexArray&) {}, + const ClaimDiskReserveCallback& DiskReserveCallback = []() { return 0; }); void IterateChunks(const std::vector<BlockStoreLocation>& ChunkLocations, IterateChunksSmallSizeCallback SmallSizeCallback, |