aboutsummaryrefslogtreecommitdiff
path: root/zenstore/compactcas.cpp
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-04-06 11:17:19 +0200
committerDan Engelbrecht <[email protected]>2022-04-06 11:17:19 +0200
commit895c90a2c77a73e1560bf009cea8f4539e642c81 (patch)
treed7e94edbdbea7530e1939dab5dac68e032b4d207 /zenstore/compactcas.cpp
parentOnly validate range of legacy entries on kept entries (diff)
downloadzen-895c90a2c77a73e1560bf009cea8f4539e642c81.tar.xz
zen-895c90a2c77a73e1560bf009cea8f4539e642c81.zip
logging tweaks
Diffstat (limited to 'zenstore/compactcas.cpp')
-rw-r--r--zenstore/compactcas.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp
index ee51cdf5e..5dd4cf5ac 100644
--- a/zenstore/compactcas.cpp
+++ b/zenstore/compactcas.cpp
@@ -749,8 +749,8 @@ CasContainerStrategy::CollectGarbage(GcContext& GcCtx)
m_ChunkBlocks[BlockIndex] = nullptr;
}
DeletedChunks.insert(DeletedChunks.end(), DeleteMap.begin(), DeleteMap.end());
- ZEN_DEBUG("marking cas store file for delete '{}', block #{}, '{}'",
- m_Config.RootDirectory / m_ContainerBaseName,
+ ZEN_DEBUG("marking cas store file in '{}' for delete , block #{}, '{}'",
+ m_ContainerBaseName,
BlockIndex,
OldBlockFile->GetPath());
std::error_code Ec;
@@ -880,8 +880,8 @@ CasContainerStrategy::CollectGarbage(GcContext& GcCtx)
DeletedChunks.insert(DeletedChunks.end(), DeleteMap.begin(), DeleteMap.end());
MovedBlockChunks.clear();
- ZEN_DEBUG("marking cas store file for delete '{}', block index #{}, '{}'",
- m_Config.RootDirectory / m_ContainerBaseName,
+ ZEN_DEBUG("marking cas store file in '{}' for delete , block #{}, '{}'",
+ m_ContainerBaseName,
BlockIndex,
OldBlockFile->GetPath());
std::error_code Ec;
@@ -1021,9 +1021,7 @@ CasContainerStrategy::ReadIndexFile()
{
if (!ValidateEntry(Entry, InvalidEntryReason))
{
- ZEN_WARN("skipping invalid entry in '{}', reason: '{}'",
- GetIndexPath(m_Config.RootDirectory, m_ContainerBaseName),
- InvalidEntryReason);
+ ZEN_WARN("skipping invalid entry in '{}', reason: '{}'", SidxPath, InvalidEntryReason);
continue;
}
m_LocationMap[Entry.Key] = Entry.Location;
@@ -1077,9 +1075,7 @@ CasContainerStrategy::ReadLog(uint64_t SkipEntryCount)
}
if (!ValidateEntry(Record, InvalidEntryReason))
{
- ZEN_WARN("skipping invalid entry in '{}', reason: '{}'",
- GetLogPath(m_Config.RootDirectory, m_ContainerBaseName),
- InvalidEntryReason);
+ ZEN_WARN("skipping invalid entry in '{}', reason: '{}'", SlogPath, InvalidEntryReason);
return;
}
m_LocationMap[Record.Key] = Record.Location;
@@ -1528,7 +1524,7 @@ CasContainerStrategy::OpenContainer(bool IsNewStore)
{
// Log removing unreferenced block
// Clear out unused blocks
- ZEN_INFO("removing unused block for '{}' at '{}'", BasePath, Path);
+ ZEN_INFO("removing unused block for '{}' at '{}'", m_ContainerBaseName, Path);
std::error_code Ec;
std::filesystem::remove(Path, Ec);
if (Ec)