diff options
| -rw-r--r-- | src/libstore/build.cc | 4 | ||||
| -rw-r--r-- | tests/parallel.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index b448cc6b7fc3..1482d6926920 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2597,12 +2597,12 @@ void Worker::waitForInput() /* If we are polling goals that are waiting for a lock, then wake up after a few seconds at most. */ - int wakeUpInterval = 3; + int wakeUpInterval = queryIntSetting("build-poll-interval", 5); if (!waitingForAWhile.empty()) { useTimeout = true; if (lastWokenUp == 0) - printMsg(lvlError, "waiting for locks..."); + printMsg(lvlError, "waiting for locks or build slots..."); if (lastWokenUp == 0 || lastWokenUp > before) lastWokenUp = before; timeout.tv_sec = std::max((time_t) 0, lastWokenUp + wakeUpInterval - before); } else lastWokenUp = 0; diff --git a/tests/parallel.sh b/tests/parallel.sh index ddfb1523bc83..946e0a103b3a 100644 --- a/tests/parallel.sh +++ b/tests/parallel.sh @@ -27,7 +27,7 @@ clearStore rm -f $SHARED.cur $SHARED.max -drvPath=$($nixinstantiate parallel.nix --argstr sleepTime 7) +drvPath=$($nixinstantiate parallel.nix --argstr sleepTime 8) cmd="$nixstore -j1 -r $drvPath" |