apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-16 10:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removing spaces in SevWarn trace event names

Browse Source
This commit is contained in:
Josh Slocum 2021-05-25 15:32:49 +00:00
parent f299bfa9ac
commit 07edc1db9a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fdbserver/FDBExecHelper.actor.cpp
View File

@ -148,7 +148,10 @@ ACTOR Future<int> spawnProcess(std::string path,
state pid_t pid = pidAndReadFD.first; state pid_t pid = pidAndReadFD.first;
state Optional<int> readFD = pidAndReadFD.second; state Optional<int> readFD = pidAndReadFD.second;
if (pid == -1) { if (pid == -1) {
TraceEvent(SevWarnAlways, "SpawnProcess: Command failed to spawn").detail("Cmd", path).detail("Args", allArgs); TraceEvent(SevWarnAlways, "SpawnProcessFailure")
.detail("Reason", "Command failed to spawn")
.detail("Cmd", path)
.detail("Args", allArgs);
return -1; return -1;
} else if (pid > 0) { } else if (pid > 0) {
state int status = -1; state int status = -1;
@ -160,7 +163,8 @@ ACTOR Future<int> spawnProcess(std::string path,
if (runTime > maxWaitTime) { if (runTime > maxWaitTime) {
// timing out // timing out
TraceEvent(SevWarnAlways, "SpawnProcess : Command failed, timeout") TraceEvent(SevWarnAlways, "SpawnProcessFailure")
.detail("Reason", "Command failed, timeout")
.detail("Cmd", path) .detail("Cmd", path)
.detail("Args", allArgs); .detail("Args", allArgs);
return -1; return -1;
@ -175,9 +179,10 @@ ACTOR Future<int> spawnProcess(std::string path,
} }
if (err < 0) { if (err < 0) {
TraceEvent event(SevWarnAlways, "SpawnProcess : Command failed"); TraceEvent event(SevWarnAlways, "SpawnProcessFailure");
setupTraceWithOutput(event, bytesRead, outputBuffer); setupTraceWithOutput(event, bytesRead, outputBuffer);
event.detail("Cmd", path) event.detail("Reason", "Command failed")
.detail("Cmd", path)
.detail("Args", allArgs) .detail("Args", allArgs)
.detail("Errno", WIFEXITED(status) ? WEXITSTATUS(status) : -1); .detail("Errno", WIFEXITED(status) ? WEXITSTATUS(status) : -1);
return -1; return -1;
@ -194,14 +199,15 @@ ACTOR Future<int> spawnProcess(std::string path,
} else { } else {
// child process completed // child process completed
if (!(WIFEXITED(status) && WEXITSTATUS(status) == 0)) { if (!(WIFEXITED(status) && WEXITSTATUS(status) == 0)) {
TraceEvent event(SevWarnAlways, "SpawnProcess : Command failed"); TraceEvent event(SevWarnAlways, "SpawnProcessFailure");
setupTraceWithOutput(event, bytesRead, outputBuffer); setupTraceWithOutput(event, bytesRead, outputBuffer);
event.detail("Cmd", path) event.detail("Reason", "Command failed")
.detail("Cmd", path)
.detail("Args", allArgs) .detail("Args", allArgs)
.detail("Errno", WIFEXITED(status) ? WEXITSTATUS(status) : -1); .detail("Errno", WIFEXITED(status) ? WEXITSTATUS(status) : -1);
return WIFEXITED(status) ? WEXITSTATUS(status) : -1; return WIFEXITED(status) ? WEXITSTATUS(status) : -1;
} }
TraceEvent event("SpawnProcess : Command status"); TraceEvent event("SpawnProcess_CommandStatus");
setupTraceWithOutput(event, bytesRead, outputBuffer); setupTraceWithOutput(event, bytesRead, outputBuffer);
event.detail("Cmd", path) event.detail("Cmd", path)
.detail("Args", allArgs) .detail("Args", allArgs)