Merge ~andersson123/autopkgtest-cloud:db-backup-add-checksum-to-filename into autopkgtest-cloud:master

[Tim Andersson]

[Brian Murray (brian-murray)]

I don't know what workflow you have in mind here but I'd think it would be easier to have the checksum in the filename so that when you copy the item out of swift and put it on your local disk you have the checksum right there instead of having to look it up somewhere else.

[Tim Andersson (andersson123)]

Ah, I see what you mean, that makes more sense. I'll amend this MP.

[Tim Andersson (andersson123)]

Amended and ready for re-review

[Skia (hyask)]

review: Needs Fixing

[Tim Andersson (andersson123)]

This is amended and ready for re-review

[Brian Murray (brian-murray)]

Thanks for fixing that. Approved provided CI passes.

review: Approve

[Tim Andersson (andersson123)]

It looks like we're having issues with CI. I pushed this EOD yesterday ish. So it should've completed by now. I'll run LPCI locally and if it passes, I'll merge this.

[Tim Andersson (andersson123)]

LPCI passed on my machine, going to merge it, I've added a note on my todo list to look into CI weirdness

diff --git a/charms/focal/autopkgtest-web/webcontrol/db-backup b/charms/focal/autopkgtest-web/webcontrol/db-backup
index 4ca6a20..08b8513 100755
--- a/charms/focal/autopkgtest-web/webcontrol/db-backup
+++ b/charms/focal/autopkgtest-web/webcontrol/db-backup
@@ -8,6 +8,7 @@ import atexit
 import configparser
 import datetime
 import gzip
+import hashlib
 import logging
 import os
 import shutil
@@ -96,6 +97,12 @@ def create_container_if_it_doesnt_exist(swift_conn: swiftclient.Connection):
         )
 
 
+def get_db_backup_checksum():
+    with open("%s.gz" % DB_BACKUP_PATH, "rb") as bkp_f:
+        md5 = hashlib.md5(bkp_f.read()).hexdigest()
+    return md5
+
+
 def upload_backup_to_db(
     swift_conn: swiftclient.Connection,
 ) -> swiftclient.Connection:
@@ -103,7 +110,13 @@ def upload_backup_to_db(
     Upload compressed database to swift storage under container db-backups
     """
     now = datetime.datetime.utcnow().strftime("%Y/%m/%d/%H_%M_%S")
-    object_path = "%s/%s" % (now, DB_PATH.name + ".gz")
+    checksum = get_db_backup_checksum()
+    object_path = "%s/%s-%s.%s" % (
+        now,
+        DB_PATH.name.split(".")[0],
+        checksum,
+        "db.gz",
+    )
     for retry in range(SWIFT_RETRIES):
         try:
             swift_conn.put_object(