Merge ~andersson123/autopkgtest-cloud:no-double-download-results into autopkgtest-cloud:master

[Tim Andersson]

b06c91b... by Tim Andersson on 2024-04-26

fix: web: add UNIQUE constraint to uuid column creation in helpers/utils.py `init_db`

Whilst this doesn't fix the issue of two "write requests" going into
the sqlite-writer queue, this commit would still mean we get no
duplicate results.

Even in the case of two duplicate queue message, this commit would just
ensure that the original entry is just replaced with the duplicate
entry.

Unmerged commits

78b2b4d... by Tim Andersson on 2024-04-26

fix: web: add hacky fix for download-results to stop duplicate results

	pre_commit:0 (build)
	unit_tests:0 (build)
	build_charms:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

b06c91b... by Tim Andersson on 2024-04-26

fix: web: add UNIQUE constraint to uuid column creation in helpers/utils.py `init_db`

Whilst this doesn't fix the issue of two "write requests" going into
the sqlite-writer queue, this commit would still mean we get no
duplicate results.

Even in the case of two duplicate queue message, this commit would just
ensure that the original entry is just replaced with the duplicate
entry.

	pre_commit:0 (build)
	unit_tests:0 (build)
	build_charms:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

diff --git a/charms/focal/autopkgtest-web/webcontrol/download-results b/charms/focal/autopkgtest-web/webcontrol/download-results
index 1297a66..5cae5dc 100755
--- a/charms/focal/autopkgtest-web/webcontrol/download-results
+++ b/charms/focal/autopkgtest-web/webcontrol/download-results
@@ -122,6 +122,11 @@ if __name__ == "__main__":
     logging.basicConfig(
         level=("DEBUG" in os.environ and logging.DEBUG or logging.INFO)
     )
+    # FIXME: Hacky interrim solution to fix synchronisation issues
+    if os.path.exists("/run/autopkgtest-web-is-leader"):
+        logging.info("Unit is not leader, exiting...")
+        time.sleep(300)
+        sys.exit(0)
 
     amqp_con = amqp_connect()
     status_ch = amqp_con.channel()
diff --git a/charms/focal/autopkgtest-web/webcontrol/helpers/utils.py b/charms/focal/autopkgtest-web/webcontrol/helpers/utils.py
index 4e26eb8..11b9774 100644
--- a/charms/focal/autopkgtest-web/webcontrol/helpers/utils.py
+++ b/charms/focal/autopkgtest-web/webcontrol/helpers/utils.py
@@ -123,7 +123,7 @@ def init_db(path, **kwargs):
             "  exitcode INTEGER, "
             "  requester TEXT, "
             "  env TEXT, "
-            "  uuid TEXT,  "
+            "  uuid TEXT UNIQUE,  "
             "  PRIMARY KEY(test_id, run_id), "
             "  FOREIGN KEY(test_id) REFERENCES test(id))"
         )