max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

warn-large-path-threshold: define 0 as number to disable warnings

Browse source 
the default int64_t max was still overflowing for me, when this was dumped as json (noticed during building the manual).
So making 0, the default and define it as "no warnings" fixes the situtation.
Also it's much more human-readable in documentation.
This commit is contained in:
Jörg Thalheim 2024-10-21 16:32:53 +02:00
parent 1ed166315c
commit e1834f4caa
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/globals.hh
View file

@ -1227,14 +1227,13 @@ public:
Setting<uint64_t> warnLargePathThreshold{ Setting<uint64_t> warnLargePathThreshold{
this, this,
// n.b. this is deliberately int64 max rather than uint64 max because 0,
// this goes through the Nix language JSON parser and thus needs to be
// representable in Nix language integers.
std::numeric_limits<int64_t>::max(),
"warn-large-path-threshold", "warn-large-path-threshold",
R"( R"(
Warn when copying a path larger than this number of bytes to the Nix store Warn when copying a path larger than this number of bytes to the Nix store
(as determined by its NAR serialisation). (as determined by its NAR serialisation).
Default is 0, which disables the warning.
Set it to 1 to warn on all paths.
)" )"
}; };
}; };

4
src/libstore/store-api.cc
View file

@ -171,7 +171,7 @@ std::pair<StorePath, Hash> StoreDirConfig::computeStorePath(
PathFilter & filter) const PathFilter & filter) const
{ {
auto [h, size] = hashPath(path, method.getFileIngestionMethod(), hashAlgo, filter); auto [h, size] = hashPath(path, method.getFileIngestionMethod(), hashAlgo, filter);
if (size && *size >= settings.warnLargePathThreshold) if (settings.warnLargePathThreshold && size && *size >= settings.warnLargePathThreshold)
warn("hashed large path '%s' (%s)", path, renderSize(*size)); warn("hashed large path '%s' (%s)", path, renderSize(*size));
return { return {
makeFixedOutputPathFromCA( makeFixedOutputPathFromCA(
@ -214,7 +214,7 @@ StorePath Store::addToStore(
auto sink = sourceToSink([&](Source & source) { auto sink = sourceToSink([&](Source & source) {
LengthSource lengthSource(source); LengthSource lengthSource(source);
storePath = addToStoreFromDump(lengthSource, name, fsm, method, hashAlgo, references, repair); storePath = addToStoreFromDump(lengthSource, name, fsm, method, hashAlgo, references, repair);
if (lengthSource.total >= settings.warnLargePathThreshold) if (settings.warnLargePathThreshold && lengthSource.total >= settings.warnLargePathThreshold)
warn("copied large path '%s' to the store (%s)", path, renderSize(lengthSource.total)); warn("copied large path '%s' to the store (%s)", path, renderSize(lengthSource.total));
}); });
dumpPath(path, *sink, fsm, filter); dumpPath(path, *sink, fsm, filter);