Changeset 280967 in webkit

Timestamp:

Aug 12, 2021, 8:23:37 AM (5 years ago)

Author:

Jonathan Bedard

Message:

[check-github-mirror-integrity] Differentiate between slow sync and collapsed commits
​https://bugs.webkit.org/show_bug.cgi?id=229004
<rdar://problem/81795644>

Reviewed by Aakash Jain.

• Scripts/check-github-mirror-integrity: Use commit timestamps to differentiate between a slow sync between svn.webkit.org

and GitHub and git-svn combining commits

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-github-mirror-integrity (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-12  Jonathan Bedard  <jbedard@apple.com>
+
+        [check-github-mirror-integrity] Differentiate between slow sync and collapsed commits
+        https://bugs.webkit.org/show_bug.cgi?id=229004
+        <rdar://problem/81795644>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/check-github-mirror-integrity: Use commit timestamps to differentiate between a slow sync between svn.webkit.org
+        and GitHub and git-svn combining commits
+
 2021-08-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/check-github-mirror-integrity

@@ -28 +28 @@
 
 from webkitpy import webkitscmpy
+from webkitcorepy.string_utils import pluralize
 from webkitscmpy import local, remote
+
+
+SYNC_TIME_LIMIT = 5 * 60  # 5 minutes
 
 
@@ -45 +49 @@
     canonical_tip = repository.commit(branch='trunk')
 
-    if mirror_tip.identifier == canonical_tip.identifier:
+    timestamps_equal = mirror_tip.timestamp == canonical_tip.timestamp
+
+    if timestamps_equal and mirror_tip.identifier == canonical_tip.identifier:
         print('GitHub and svn.webkit.org are in sync')
         print(f'HEAD commit on GitHub {mirror_tip} matches HEAD commit on svn.webkit.org {canonical_tip}')
         return 0
 
-    if time.time() >= canonical_tip.timestamp - 5 * 60 and mirror_tip.identifier == canonical_tip.identifier - 1:
-        print('GitHub is 1 commit behind svn.webkit.org. This is ok.')
+    if timestamps_equal and mirror_tip.identifier != canonical_tip.identifier:
+        print('ERROR: GitHub and svn.webkit.org are out of sync')
+        print(f'HEAD commit on GitHub {mirror_tip} out of sync with HEAD commit on svn.webkit.org {canonical_tip}')
+        return 1
+
+    difference = canonical_tip.identifier - mirror_tip.identifier
+    if time.time() < canonical_tip.timestamp + SYNC_TIME_LIMIT:
+        print('GitHub is {} behind svn.webkit.org, but might be updating, This is ok.'.format(pluralize(difference, 'commit')))
         print(f'HEAD commit on GitHub {mirror_tip} slightly behind HEAD commit on svn.webkit.org {canonical_tip}')
         return 0
 
-    print('ERROR: GitHub and svn.webkit.org are out of sync')
+    print('ERROR: GitHub is not syncing from svn.webkit.org and is {} behind'.format(pluralize(difference, 'commit')))
     print(f'HEAD commit on GitHub {mirror_tip} out of sync with HEAD commit on svn.webkit.org {canonical_tip}')
-    print('This indicates a serious error with the repository, please inform admin@webkit.org urgently')
     return 1