importer: Fix updated < time violations due to clock skew

There can be some clock skew between us and logs.tf. This could result in our local updated time being less than the log's time, violating the check constraint. Fix this by taking the greatest of now and time. When updating logs, take the greatest between now and updated + 1 (to ensure updated always changes). Fixes: 7aed5b6 ("Add updated field to logs") Signed-off-by: Sean Anderson <[email protected]>
Forty-Bot · Feb 23, 2024 · a9ae28b · a9ae28b
1 parent 51f31d2
commit a9ae28b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/trends/importer/link_demos.py b/trends/importer/link_demos.py
@@ -43,7 +43,7 @@ def link_logs(args, c):
         cur.execute("""UPDATE log
                        SET
                            demoid = linked.demoid,
-                           updated = extract(EPOCH FROM now())::BIGINT
+                           updated = greatest(extract(EPOCH FROM now())::BIGINT, log.updated + 1)
                        FROM linked
                        WHERE log.logid = linked.logid;""")
         cur.execute("COMMIT;")

diff --git a/trends/importer/link_matches.py b/trends/importer/link_matches.py
@@ -86,7 +86,7 @@ def link_matches(args, c):
         cur.execute("""UPDATE log SET
                            league = log_matches.league,
                            matchid = log_matches.matchid,
-                           updated = extract(EPOCH FROM now())::BIGINT,
+                           updated = greatest(extract(EPOCH FROM now())::BIGINT, log.updated + 1),
                            team1_is_red = log_matches.team1_is_red
                        FROM log_matches
                        WHERE log.logid = log_matches.logid;""")

diff --git a/trends/importer/logs.py b/trends/importer/logs.py
@@ -114,7 +114,7 @@ def import_log(c, logid, log):
                      (SELECT mapid FROM map WHERE map = %(map)s),
                      %(red_score)s, %(blue_score)s, %(AD_scoring)s, %(uploader_playerid)s,
                      (SELECT nameid FROM name WHERE name = %(uploader_name)s),
-                     extract(EPOCH FROM now())::BIGINT
+                     greatest(extract(EPOCH FROM now())::BIGINT, %(date)s)
                  );""",
               info)
     c.execute("INSERT INTO log_json (logid, data) VALUES (%s, %s)", (logid, log))