From 9727892b61e89694211cf41359c0e07398890c1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 26 Mar 2020 15:30:37 +0100
Subject: [PATCH] Don't spam the journal with hydra-queue-runner status dumps

(cherry picked from commit 15ae932488512ba235ed2f6f841cc5eb56ba9314)
---
 src/hydra-queue-runner/hydra-queue-runner.cc | 13 ++++---------
 src/hydra-queue-runner/state.hh              |  5 +----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index 8d729bd1..65d93a04 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -491,7 +491,7 @@ std::shared_ptr<PathLocks> State::acquireGlobalLock()
 }
 
 
-void State::dumpStatus(Connection & conn, bool log)
+void State::dumpStatus(Connection & conn)
 {
     std::ostringstream out;
 
@@ -672,11 +672,6 @@ void State::dumpStatus(Connection & conn, bool log)
         }
     }
 
-    if (log && time(0) >= lastStatusLogged + statusLogInterval) {
-        printMsg(lvlInfo, format("status: %1%") % out.str());
-        lastStatusLogged = time(0);
-    }
-
     {
         auto mc = startDbUpdate();
         pqxx::work txn(conn);
@@ -785,7 +780,7 @@ void State::run(BuildID buildOne)
     {
         auto conn(dbPool.get());
         clearBusy(*conn, 0);
-        dumpStatus(*conn, false);
+        dumpStatus(*conn);
     }
 
     std::thread(&State::monitorMachinesFile, this).detach();
@@ -848,8 +843,8 @@ void State::run(BuildID buildOne)
             auto conn(dbPool.get());
             receiver dumpStatus_(*conn, "dump_status");
             while (true) {
-                conn->await_notification(statusLogInterval / 2 + 1, 0);
-                dumpStatus(*conn, true);
+                conn->await_notification();
+                dumpStatus(*conn);
             }
         } catch (std::exception & e) {
             printMsg(lvlError, format("main thread: %1%") % e.what());
diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh
index c702e8a3..31c7fddf 100644
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -420,9 +420,6 @@ private:
     size_t maxOutputSize;
     size_t maxLogSize;
 
-    time_t lastStatusLogged = 0;
-    const int statusLogInterval = 300;
-
     /* Steps that were busy while we encounted a PostgreSQL
        error. These need to be cleared at a later time to prevent them
        from showing up as busy until the queue runner is restarted. */
@@ -546,7 +543,7 @@ private:
        has it. */
     std::shared_ptr<nix::PathLocks> acquireGlobalLock();
 
-    void dumpStatus(Connection & conn, bool log);
+    void dumpStatus(Connection & conn);
 
     void addRoot(const nix::StorePath & storePath);