try testing tx q

irrdnet · Jul 11, 2023 · 4cb5edc · 4cb5edc
1 parent ce99b79
commit 4cb5edc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -197,6 +197,7 @@ jobs:
           POSTGRES_USER: root
           POSTGRES_DB: circle_test
           POSTGRES_HOST_AUTH_METHOD: trust
+        command: postgres -c track_commit_timestamp=true
 
       - image: cimg/redis:<< parameters.redis_version >>
 #      - image: cimg/rust:1.65
@@ -233,6 +234,7 @@ jobs:
           POSTGRES_USER: root
           POSTGRES_DB: circle_test
           POSTGRES_HOST_AUTH_METHOD: trust
+        command: postgres -c track_commit_timestamp=true
 
       - image: cimg/redis:<< parameters.redis_version >>
 #      - image: cimg/rust:1.65
@@ -271,6 +273,7 @@ jobs:
           POSTGRES_USER: root
           POSTGRES_DB: circle_test
           POSTGRES_HOST_AUTH_METHOD: trust
+        command: postgres -c track_commit_timestamp=true
 
       - image: cimg/redis:<< parameters.redis_version >>
 #      - image: cimg/rust:1.65
@@ -310,6 +313,7 @@ jobs:
           POSTGRES_USER: root
           POSTGRES_DB: circle_test
           POSTGRES_HOST_AUTH_METHOD: trust
+        command: postgres -c track_commit_timestamp=true
 
       - image: cimg/redis:<< parameters.redis_version >>
 #      - image: cimg/rust:1.65

diff --git a/irrd/storage/database_handler.py b/irrd/storage/database_handler.py
@@ -586,7 +586,7 @@ def delete_rpsl_object(
             table.c.prefix,
             table.c.object_text,
         )
-        results = self._connection.execute(stmt)
+        results = self.execute_statement(stmt)
 
         if not self._check_single_row_match(results, user_identifier=f"{rpsl_pk}/{source}"):
             return None
@@ -817,6 +817,10 @@ def set_force_reload(self, source):
             "current settings, actual reload process wll take place in next scheduled importer run"
         )
 
+    def timestamp_last_committed_transaction(self) -> datetime:
+        result = self.execute_statement("SELECT timestamp FROM pg_last_committed_xact()")
+        return result.fetchone()["timestamp"]
+
     def record_serial_newest_mirror(self, source: str, serial: int) -> None:
         """
         Record that a mirror was updated to a certain serial.

diff --git a/irrd/storage/tests/test_database.py b/irrd/storage/tests/test_database.py
@@ -215,6 +215,7 @@ def test_object_writing_and_status_checking(self, monkeypatch, irrd_db_mock_prel
         self.dh.upsert_rpsl_object(rpsl_object_route_v6, JournalEntryOrigin.auth_change, source_serial=43)
 
         self.dh.commit()
+        initial_tx_timestamp = self.dh.timestamp_last_committed_transaction()
         self.dh.refresh_connection()
 
         # There should be two entries with MNT-CORRECT in the db now.
@@ -442,6 +443,8 @@ def test_object_writing_and_status_checking(self, monkeypatch, irrd_db_mock_prel
         assert not len(list(self.dh.execute_query(DatabaseStatusQuery().sources(["TEST"]))))
         assert len(list(self.dh.execute_query(RPSLDatabaseQuery().sources(["TEST2"])))) == 1
 
+        assert self.dh.timestamp_last_committed_transaction() > initial_tx_timestamp
+
         self.dh.close()
 
         assert flatten_mock_calls(self.dh.changed_objects_tracker.preloader.signal_reload) == [