aboutsummaryrefslogtreecommitdiff
path: root/zenstore
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2022-06-11 23:22:00 +0200
committerStefan Boberg <[email protected]>2022-06-11 23:22:00 +0200
commit348ae50c946b541ce935703045ab98a49d809ed4 (patch)
treea400285c9e5ae215dc7ef3b2958ce922f48ec7bc /zenstore
parentfixed mac build ("unused" variable) (diff)
parentclang-format fix (diff)
downloadzen-348ae50c946b541ce935703045ab98a49d809ed4.tar.xz
zen-348ae50c946b541ce935703045ab98a49d809ed4.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenstore')
-rw-r--r--zenstore/cidstore.cpp2
-rw-r--r--zenstore/gc.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/zenstore/cidstore.cpp b/zenstore/cidstore.cpp
index 55bec817f..01eda4697 100644
--- a/zenstore/cidstore.cpp
+++ b/zenstore/cidstore.cpp
@@ -36,6 +36,8 @@ struct CidStore::Impl
IoBuffer Payload = ChunkData.GetCompressed().Flatten().AsIoBuffer();
IoHash CompressedHash = IoHash::HashBuffer(Payload.Data(), Payload.Size());
+ Payload.SetContentType(ZenContentType::kCompressedBinary);
+
CasStore::InsertResult Result = m_CasStore.InsertChunk(Payload, CompressedHash);
AddCompressedCid(DecompressedId, CompressedHash);
diff --git a/zenstore/gc.cpp b/zenstore/gc.cpp
index dfa3d54ab..bb03b9751 100644
--- a/zenstore/gc.cpp
+++ b/zenstore/gc.cpp
@@ -625,7 +625,7 @@ GcScheduler::SchedulerThread()
NiceBytes(Space.Total),
m_Config.Interval.count()
? fmt::format("{} until next GC", NiceTimeSpanMs(uint64_t(std::chrono::milliseconds(RemaingTime).count())))
- : std::string("next scheduled GC no set"));
+ : std::string("no GC scheduled"));
// TODO: Trigger GC if max disk usage water mark is reached