Merge pull request #6787 from roed314/proddb_ongoing_ops

Don't update ongoing operations on proddb

Author: AndrewVSutherland

lmfdb/lmfdb_database.py

@@ -2,6 +2,7 @@
 import os
 import shutil
 import signal
+import socket
 import subprocess
 from collections import Counter
 from psycopg2.sql import SQL
@@ -317,7 +318,7 @@ def _check_locks(self, changetype, datafile=None, suffix=""):
         super()._check_locks(changetype, datafile=datafile, suffix=suffix)
         if self._db.config.postgresql_options["user"] != "editor":
             raise RuntimeError("You must be logged in as editor to make data changes")
-        if changetype in _nolog_changetypes:
+        if changetype in _nolog_changetypes or socket.gethostname() == "proddb":
             return
 
         # The following is the definition of run_diskfree used below to find the available space on grace
@@ -511,8 +512,9 @@ def log_db_change(self, operation, tablename=None, logid=None, aborted=False, **
         - ``**data`` -- any additional information to install in the logging table (will be stored as a json dictionary)
         """
         if aborted:
-            deleter = SQL("DELETE FROM userdb.ongoing_operations WHERE logid = %s")
-            self._execute(deleter, [logid])
+            if socket.gethostname() != "proddb":
+                deleter = SQL("DELETE FROM userdb.ongoing_operations WHERE logid = %s")
+                self._execute(deleter, [logid])
         else:
             from lmfdb.utils.datetime_utils import utc_now_naive
             uid = self.login()
@@ -522,7 +524,7 @@ def log_db_change(self, operation, tablename=None, logid=None, aborted=False, **
                 "VALUES (%s, %s, %s, %s, %s, %s)"
             )
             self._execute(inserter, [uid, utc_now_naive(), tablename, logid, operation, data])
-            if operation not in _nolog_changetypes:
+            if operation not in _nolog_changetypes and socket.gethostname() != "proddb":
                 # This table is used by _check_locks to determine if there is enough space to execute an upload
                 inserter = SQL(
                     "INSERT INTO userdb.ongoing_operations (logid, finishing, time, tablename, operation, username) "