lix-project/nix-eval-jobs
2
1
Fork 3
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #289 from nix-community/joerg-ci

Browse source 
fix exit status reporting when evaluation fails
This commit is contained in:
Jörg Thalheim 2023-12-16 17:15:45 +01:00 committed by GitHub
parent b4f7eb3c77 b73f7ceff4
commit 4a1123c42d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/nix-eval-jobs.cc
View file

@ -113,29 +113,47 @@ void handleBrokenWorkerPipe(Proc &proc, std::string_view msg) {
int rc = waitpid(pid, &status, WNOHANG); int rc = waitpid(pid, &status, WNOHANG);
if (rc == 0) { if (rc == 0) {
kill(pid, SIGKILL); kill(pid, SIGKILL);
throw Error( throw Error("BUG: while %s, worker pipe got closed but evaluation "
"BUG: while %s, worker pipe got closed but evaluation worker still running?", "worker still running?",
msg); msg);
} else if (rc == -1) { } else if (rc == -1) {
kill(pid, SIGKILL); kill(pid, SIGKILL);
throw Error("BUG: while %s, waitpid for evaluation worker failed: %s", throw Error(
msg, strerror(errno)); "BUG: while %s, waitpid for evaluation worker failed: %s", msg,
strerror(errno));
} else { } else {
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
if (WEXITSTATUS(status) == 1) { if (WEXITSTATUS(status) == 1) {
throw Error( throw Error(
"while %s, evaluation worker exited with exit code 1, " "while %s, evaluation worker exited with exit code 1, "
"(possibly an infinite recursion)", "(possible infinite recursion)",
msg); msg);
} }
throw Error("while %s, evaluation worker exited with %d", throw Error("while %s, evaluation worker exited with %d", msg,
msg, WEXITSTATUS(status)); WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
if (WTERMSIG(status) == SIGKILL) { switch (WTERMSIG(status)) {
case SIGKILL:
throw Error( throw Error(
"while %s, evaluation worker got killed by SIGKILL, maybe " "while %s, evaluation worker got killed by SIGKILL, "
"maybe "
"memory limit reached?", "memory limit reached?",
msg); msg);
break;
#ifdef __APPLE__
case SIGBUS:
throw Error(
"while %s, evaluation worker got killed by SIGBUS, "
"(possible infinite recursion)",
msg);
break;
#else
case SIGSEGV:
throw Error(
"while %s, evaluation worker got killed by SIGSEGV, "
"(possible infinite recursion)",
msg);
#endif
} }
throw Error( throw Error(
"while %s, evaluation worker got killed by signal %d (%s)", "while %s, evaluation worker got killed by signal %d (%s)",
@ -147,7 +165,7 @@ void handleBrokenWorkerPipe(Proc &proc, std::string_view msg) {
std::string joinAttrPath(json &attrPath) { std::string joinAttrPath(json &attrPath) {
std::string joined; std::string joined;
for (auto& element : attrPath) { for (auto &element : attrPath) {
if (!joined.empty()) { if (!joined.empty()) {
joined += '.'; joined += '.';
} }
@ -220,7 +238,8 @@ void collector(Sync<State> &state_, std::condition_variable &wakeup) {
/* Wait for the response. */ /* Wait for the response. */
auto respString = fromReader->readLine(); auto respString = fromReader->readLine();
if (respString.empty()) { if (respString.empty()) {
auto msg = "reading result for attrPath '" + joinAttrPath(attrPath) + "'"; auto msg = "reading result for attrPath '" +
joinAttrPath(attrPath) + "'";
handleBrokenWorkerPipe(*proc.get(), msg); handleBrokenWorkerPipe(*proc.get(), msg);
} }
json response; json response;

2
tests/test_eval.py
View file

@ -116,5 +116,5 @@ def test_recursion_error() -> None:
) )
assert res.returncode == 1 assert res.returncode == 1
print(res.stderr) print(res.stderr)
assert 'packageWithInfiniteRecursion' in res.stderr assert "packageWithInfiniteRecursion" in res.stderr
assert "possible infinite recursion" in res.stderr assert "possible infinite recursion" in res.stderr