diff options
3 files changed, 29 insertions, 24 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index bfc42083..994d2b43 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -76,7 +76,8 @@ namespace { BlobContainer container{}; while (not blobs.empty()) { if (count + blobs.size() > size) { - Logger::Log(LogLevel::Error, "received more blobs than requested."); + Logger::Log(LogLevel::Warning, + "received more blobs than requested."); return false; } for (auto const& blob : blobs) { @@ -88,7 +89,7 @@ namespace { container.Emplace(BazelBlob{blob.digest, blob.data, exec}); } catch (std::exception const& ex) { Logger::Log( - LogLevel::Error, "failed to emplace blob: ", ex.what()); + LogLevel::Warning, "failed to emplace blob: ", ex.what()); return false; } } @@ -97,7 +98,7 @@ namespace { } if (count != size) { - Logger::Log(LogLevel::Error, "could not retrieve all requested blobs."); + Logger::Log(LogLevel::Debug, "could not retrieve all requested blobs."); return false; } @@ -210,7 +211,7 @@ auto BazelApi::CreateAction( std::optional<gsl::not_null<IExecutionApi*>> const& alternative) noexcept -> bool { if (artifacts_info.size() != output_paths.size()) { - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Warning, "different number of digests and output paths."); return false; } @@ -250,7 +251,8 @@ auto BazelApi::CreateAction( std::size_t count{}; while (not blobs.empty()) { if (count + blobs.size() > size) { - Logger::Log(LogLevel::Error, "received more blobs than requested."); + Logger::Log(LogLevel::Warning, + "received more blobs than requested."); return false; } for (std::size_t pos = 0; pos < blobs.size(); ++pos) { @@ -259,7 +261,7 @@ auto BazelApi::CreateAction( if (not FileSystemManager::WriteFileAs</*kSetEpochTime=*/true, /*kSetWritable=*/true>( blobs[pos].data, output_paths[gpos], type)) { - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Warning, "staging to output path {} failed.", output_paths[gpos].string()); return false; @@ -270,7 +272,8 @@ auto BazelApi::CreateAction( } if (count != size) { - Logger::Log(LogLevel::Error, "could not retrieve all requested blobs."); + Logger::Log(LogLevel::Warning, + "could not retrieve all requested blobs."); return false; } @@ -282,7 +285,7 @@ auto BazelApi::CreateAction( std::vector<int> const& fds, bool raw_tree) noexcept -> bool { if (artifacts_info.size() != fds.size()) { - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Warning, "different number of digests and file descriptors."); return false; } @@ -295,7 +298,7 @@ auto BazelApi::CreateAction( auto const success = network_->DumpToStream(info, out, raw_tree); std::fclose(out); if (not success) { - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Warning, "dumping {} {} to file descriptor {} failed.", IsTreeObject(info.type) ? "tree" : "blob", info.ToString(), @@ -305,7 +308,7 @@ auto BazelApi::CreateAction( } else { Logger::Log( - LogLevel::Error, "opening file descriptor {} failed.", fd); + LogLevel::Warning, "opening file descriptor {} failed.", fd); return false; } } @@ -416,8 +419,9 @@ auto BazelApi::CreateAction( }); } } catch (std::exception const& ex) { - Logger::Log( - LogLevel::Error, "Artifact synchronization failed: {}", ex.what()); + Logger::Log(LogLevel::Warning, + "Artifact synchronization failed: {}", + ex.what()); return false; } diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp index 903bb59d..f8333792 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -30,7 +30,7 @@ namespace { return BazelMsgFactory::MessageFromString<bazel_re::Directory>( blobs.at(0).data); } - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Debug, "Directory {} not found in CAS", NativeSupport::Unprefix(digest.hash())); return std::nullopt; @@ -71,7 +71,7 @@ namespace { check_symlinks, /*is_hex_id=*/false); } - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Debug, "Tree {} not found in CAS", NativeSupport::Unprefix(digest.hash())); return std::nullopt; @@ -85,7 +85,7 @@ namespace { if (raw_tree) { auto blobs = network->ReadBlobs({tree_digest}).Next(); if (blobs.size() != 1) { - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Debug, "Object {} not found in CAS", NativeSupport::Unprefix(tree_digest.hash())); return false; @@ -197,7 +197,7 @@ auto BazelNetwork::DoUploadBlobs(T_Iter const& first, return cas_->UpdateSingleBlob(instance_name_, x); }); } catch (...) { - Logger::Log(LogLevel::Error, "Unknown exception"); + Logger::Log(LogLevel::Warning, "Unknown exception"); return false; } } @@ -229,7 +229,7 @@ auto BazelNetwork::ExecuteBazelActionSync( if (response.state != BazelExecutionClient::ExecutionResponse::State::Finished or not response.output) { - Logger::Log(LogLevel::Error, + Logger::Log(LogLevel::Warning, "Failed to execute action with execution id {}.", action.hash()); return std::nullopt; @@ -271,7 +271,8 @@ auto BazelNetwork::BlobReader::Next() noexcept -> std::vector<BazelBlob> { begin_ = current_; } } catch (std::exception const& e) { - Logger::Log(LogLevel::Error, "Reading blobs failed with: {}", e.what()); + Logger::Log( + LogLevel::Warning, "Reading blobs failed with: {}", e.what()); Ensures(false); } diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp index 79ed20ca..eba2b0fd 100644 --- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp @@ -47,7 +47,7 @@ class ByteStreamClient { if (not finished_) { auto status = reader_->Finish(); if (not status.ok()) { - logger_->Emit(LogLevel::Error, + logger_->Emit(LogLevel::Debug, "{}: {}", static_cast<int>(status.error_code()), status.error_message()); @@ -130,7 +130,7 @@ class ByteStreamClient { auto const committed_size = QueryWriteStatus(resource_name); if (committed_size <= 0) { logger_.Emit( - LogLevel::Error, + LogLevel::Warning, "broken stream for upload to resource name {}", resource_name); return false; @@ -142,7 +142,7 @@ class ByteStreamClient { } } while (pos < data.size()); if (not writer->WritesDone()) { - logger_.Emit(LogLevel::Error, + logger_.Emit(LogLevel::Warning, "broken stream for upload to resource name {}", resource_name); return false; @@ -150,13 +150,13 @@ class ByteStreamClient { auto status = writer->Finish(); if (not status.ok()) { - LogStatus(&logger_, LogLevel::Error, status); + LogStatus(&logger_, LogLevel::Debug, status); return false; } if (gsl::narrow<std::size_t>(response.committed_size()) != data.size()) { logger_.Emit( - LogLevel::Error, + LogLevel::Warning, "Commited size {} is different from the original one {}.", response.committed_size(), data.size()); @@ -164,7 +164,7 @@ class ByteStreamClient { } return true; } catch (...) { - logger_.Emit(LogLevel::Error, "Caught exception in Write"); + logger_.Emit(LogLevel::Warning, "Caught exception in Write"); return false; } } |