facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

limit the number of thrift arguments that we log for some calls

Browse Source 
Summary:
Update the logging for `getFileInformation()`, `glob()`, `globFiles()`, and
`getSHA1()` to log at most 5 paths, plus the number of remaining paths.
Watchman can sometimes call `getFileInformation()` with tens of thousands of
paths.  We don't enable these log messages by default, but if someone has
turned up the log levels to help debug, this can easily fill up the log files
with spam.

Reviewed By: wez

Differential Revision: D17623234

fbshipit-source-id: 3ea8ace294fb8f042f1c53382c76148ba4af95f6
This commit is contained in:
Adam Simpkins 2019-09-27 15:36:23 -07:00 committed by Facebook Github Bot
parent db64bce681
commit beece856bd
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eden/fs/service/EdenServiceHandler.cpp
View File

@ -103,6 +103,26 @@ std::string logHash(StringPiece thriftArg) {
return folly::hexlify(thriftArg);
}
}
/**
* Convert a vector of strings from a thrift argument to a field
* that we can log in an INSTRUMENT_THRIFT_CALL() log message.
*
* This truncates very log lists to only log the first few elements.
*/
std::string toLogArg(const std::vector<std::string>& args) {
constexpr size_t limit = 5;
if (args.size() <= limit) {
return "[" + folly::join(", ", args) + "]";
} else {
return folly::to<string>(
"[",
folly::join(", ", args.begin(), args.begin() + limit),
", and ",
args.size() - limit,
" more]");
}
}
} // namespace
#define TLOG(logger, level, file, line) \
@ -378,8 +398,7 @@ void EdenServiceHandler::getSHA1(
unique_ptr<vector<string>> paths) {
#ifndef _WIN32
TraceBlock block("getSHA1");
auto helper = INSTRUMENT_THRIFT_CALL(
DBG3, *mountPoint, "[" + folly::join(", ", *paths.get()) + "]");
auto helper = INSTRUMENT_THRIFT_CALL(DBG3, *mountPoint, toLogArg(*paths));
vector<Future<Hash>> futures;
for (const auto& path : *paths) {
@ -715,8 +734,7 @@ EdenServiceHandler::future_getFileInformation(
std::unique_ptr<std::string> mountPoint,
std::unique_ptr<std::vector<std::string>> paths) {
#ifndef _WIN32
auto helper = INSTRUMENT_THRIFT_CALL(
DBG3, *mountPoint, "[" + folly::join(", ", *paths) + "]");
auto helper = INSTRUMENT_THRIFT_CALL(DBG3, *mountPoint, toLogArg(*paths));
auto edenMount = server_->getMount(*mountPoint);
auto rootInode = edenMount->getRootInode();
@ -768,8 +786,7 @@ void EdenServiceHandler::glob(
unique_ptr<string> mountPoint,
unique_ptr<vector<string>> globs) {
#ifndef _WIN32
auto helper = INSTRUMENT_THRIFT_CALL(
DBG3, *mountPoint, "[" + folly::join(", ", *globs.get()) + "]");
auto helper = INSTRUMENT_THRIFT_CALL(DBG3, *mountPoint, toLogArg(*globs));
auto edenMount = server_->getMount(*mountPoint);
auto rootInode = edenMount->getRootInode();
@ -805,7 +822,7 @@ folly::Future<std::unique_ptr<Glob>> EdenServiceHandler::future_globFiles(
auto helper = INSTRUMENT_THRIFT_CALL(
DBG3,
params->mountPoint,
"[" + folly::join(", ", params->globs) + "]",
toLogArg(params->globs),
params->includeDotfiles);
auto edenMount = server_->getMount(params->mountPoint);
auto rootInode = edenMount->getRootInode();