From 49fd045176504ab6c543f78f03578ab83bc2973b Mon Sep 17 00:00:00 2001 From: Chad Reynolds Date: Thu, 22 Jan 2026 13:53:12 -0800 Subject: [PATCH] Reduce CLI output during fetch invocations Push the logging about cache hits to verbose. The long cache paths for multiple files were significantly increasing the output for fetches. The output still ends up in `fetch.log` by default. --- .../cuttlefish/common/libs/utils/files.cpp | 2 + .../host/libs/web/caching_build_api.cpp | 37 +++++++------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/base/cvd/cuttlefish/common/libs/utils/files.cpp b/base/cvd/cuttlefish/common/libs/utils/files.cpp index 5c713cfd1e7..5f799acc4f5 100644 --- a/base/cvd/cuttlefish/common/libs/utils/files.cpp +++ b/base/cvd/cuttlefish/common/libs/utils/files.cpp @@ -139,6 +139,8 @@ Result CreateHardLink(const std::string& target, "link() failed trying to create hardlink from \"{}\" to \"{}\" " "with error: {}", target, hardlink, strerror(errno)); + VLOG(1) << "Created hard link from \"" << target << "\" to \"" << hardlink + << "\""; return hardlink; } diff --git a/base/cvd/cuttlefish/host/libs/web/caching_build_api.cpp b/base/cvd/cuttlefish/host/libs/web/caching_build_api.cpp index fed75ebf8ad..a5cae7d6fd1 100644 --- a/base/cvd/cuttlefish/host/libs/web/caching_build_api.cpp +++ b/base/cvd/cuttlefish/host/libs/web/caching_build_api.cpp @@ -71,6 +71,16 @@ Result ConstructCachePaths(const std::string& cache_base, return result; } +bool IsInCache(const std::string& filepath) { + const bool exists = FileExists(filepath); + if (exists) { + VLOG(1) << "Found \"" << filepath << "\" in cache"; + } else { + VLOG(1) << "\"" << filepath << "\" not in cache"; + } + return exists; +} + } // namespace Result CanCache(const std::string& target_directory, @@ -100,16 +110,9 @@ Result CachingBuildApi::DownloadFile( const std::string& artifact_name) { const auto paths = CF_EXPECT(ConstructCachePaths(cache_base_path_, build, target_directory, artifact_name)); - if (!FileExists(paths.cache_artifact)) { - LOG(INFO) << artifact_name << " not in cache. Downloading to " - << paths.build_cache; + if (!IsInCache(paths.cache_artifact)) { CF_EXPECT(build_api_.DownloadFile(build, paths.build_cache, artifact_name)); - } else { - LOG(INFO) << "Found " << artifact_name << " in cache at " - << paths.cache_artifact; } - LOG(INFO) << "Linking " << paths.cache_artifact << " to " - << paths.target_artifact; return CF_EXPECT(CreateHardLink(paths.cache_artifact, paths.target_artifact, kOverwriteExistingFile)); } @@ -120,35 +123,21 @@ Result CachingBuildApi::DownloadFileWithBackup( const auto paths = CF_EXPECT(ConstructCachePaths(cache_base_path_, build, target_directory, artifact_name, backup_artifact_name)); - if (FileExists(paths.cache_artifact)) { - LOG(INFO) << "Found " << artifact_name << " in cache at " - << paths.cache_artifact; - LOG(INFO) << "Linking " << paths.cache_artifact << " to " - << paths.target_artifact; + if (IsInCache(paths.cache_artifact)) { return CF_EXPECT(CreateHardLink(paths.cache_artifact, paths.target_artifact, kOverwriteExistingFile)); } - if (FileExists(paths.cache_backup_artifact)) { - LOG(INFO) << "Found " << backup_artifact_name << " in cache at " - << paths.cache_backup_artifact; - LOG(INFO) << "Linking " << paths.cache_backup_artifact << " to " - << paths.target_backup_artifact; + if (IsInCache(paths.cache_backup_artifact)) { return CF_EXPECT(CreateHardLink(paths.cache_backup_artifact, paths.target_backup_artifact, kOverwriteExistingFile)); } - LOG(INFO) << artifact_name << " and " << backup_artifact_name - << " not in cache. Downloading to " << paths.build_cache; const auto artifact_filepath = CF_EXPECT(build_api_.DownloadFileWithBackup( build, paths.build_cache, artifact_name, backup_artifact_name)); if (absl::EndsWith(artifact_filepath, artifact_name)) { - LOG(INFO) << "Linking " << paths.cache_artifact << " to " - << paths.target_artifact; return CF_EXPECT(CreateHardLink(paths.cache_artifact, paths.target_artifact, kOverwriteExistingFile)); } - LOG(INFO) << "Linking " << paths.cache_backup_artifact << " to " - << paths.target_backup_artifact; return CF_EXPECT(CreateHardLink(paths.cache_backup_artifact, paths.target_backup_artifact)); }