Changeset 251516 in webkit

Timestamp:

Oct 23, 2019 5:18:15 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[EWS] Multiple builds are triggered for one patch sometimes in new EWS
​https://bugs.webkit.org/show_bug.cgi?id=199417

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-app/ews/fetcher.py:

(BugzillaPatchFetcher.fetch): Set the flag before sending the patch to buildbot. Unset it in case of failure.
Also added additional check for sent_to_buildbot flag before processing patch.

• BuildSlaveSupport/ews-app/ews/models/patch.py:

(Patch.save_patch): Improved logging.
(Patch.set_sent_to_buildbot): Modified to accept sent_to_buildbot paramater, and set the value accordingly.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-app/ews/fetcher.py (modified) (2 diffs)
• BuildSlaveSupport/ews-app/ews/models/patch.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-app/ews/fetcher.py

@@ -61 +61 @@
         Patch.save_patches(patch_ids)
         patches_to_send = self.patches_to_send_to_buildbot(patch_ids)
-        _log.info('{} r? patches, {} patches need to be sent to Buildbot.'.format(len(patch_ids), len(patches_to_send)))
+        _log.info('{} r? patches, {} patches need to be sent to Buildbot: {}'.format(len(patch_ids), len(patches_to_send), patches_to_send))
 
         for patch_id in patches_to_send:
+            if Patch.is_patch_sent_to_buildbot(patch_id):
+                _log.error('Patch {} is already sent to buildbot.'.format(patch_id))
+                continue
+            Patch.set_sent_to_buildbot(patch_id, True)
             bz_patch = Bugzilla.retrieve_attachment(patch_id)
             if not bz_patch or bz_patch['id'] != patch_id:
@@ -76 +80 @@
             if rc == 0:
                 Patch.set_bug_id(patch_id, bz_patch['bug_id'])
-                Patch.set_sent_to_buildbot(patch_id)
             else:
                 _log.error('Failed to send patch to buildbot.')
+                Patch.set_sent_to_buildbot(patch_id, False)
                 #FIXME: send an email for this failure
         return patch_ids

trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py

@@ -46 +46 @@
     def save_patch(cls, patch_id, bug_id=-1, obsolete=False, sent_to_buildbot=False):
         if not Patch.is_valid_patch_id(patch_id):
+            _log.warn('Patch id {} in invalid. Skipped saving.'.format(patch_id))
             return ERR_INVALID_PATCH_ID
 
         if Patch.is_existing_patch_id(patch_id):
-            _log.debug("Patch id {} already exists in database. Skipped saving.".format(patch_id))
+            _log.debug('Patch id {} already exists in database. Skipped saving.'.format(patch_id))
             return ERR_EXISTING_PATCH
         Patch(patch_id, bug_id, obsolete, sent_to_buildbot).save()
@@ -83 +84 @@
 
     @classmethod
-    def set_sent_to_buildbot(cls, patch_id):
+    def set_sent_to_buildbot(cls, patch_id, sent_to_buildbot=True):
         if not Patch.is_existing_patch_id(patch_id):
-            return ERR_NON_EXISTING_PATCH
+            Patch.save_patch(patch_id=patch_id, sent_to_buildbot=sent_to_buildbot)
+            _log.info('Patch {} saved to database with sent_to_buildbot={}'.format(patch_id, sent_to_buildbot))
+            return SUCCESS
 
         patch = Patch.objects.get(pk=patch_id)
-        if patch.sent_to_buildbot:
-            _log.warn('Patch {} has already been sent to Buildbot.'.format(patch_id))
+        if patch.sent_to_buildbot == sent_to_buildbot:
+            _log.warn('Patch {} already has sent_to_buildbot={}'.format(patch_id, sent_to_buildbot))
             return SUCCESS
 
-        patch.sent_to_buildbot = True
+        patch.sent_to_buildbot = sent_to_buildbot
         patch.save()
-        _log.debug('Updated patch {} with sent_to_buildbot=True'.format(patch_id))
+        _log.info('Updated patch {} with sent_to_buildbot={}'.format(patch_id, sent_to_buildbot))
         return SUCCESS
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-23  Aakash Jain  <aakash_jain@apple.com>
+
+        [EWS] Multiple builds are triggered for one patch sometimes in new EWS
+        https://bugs.webkit.org/show_bug.cgi?id=199417
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-app/ews/fetcher.py:
+        (BugzillaPatchFetcher.fetch): Set the flag before sending the patch to buildbot. Unset it in case of failure. 
+        Also added additional check for sent_to_buildbot flag before processing patch.
+        * BuildSlaveSupport/ews-app/ews/models/patch.py:
+        (Patch.save_patch): Improved logging.
+        (Patch.set_sent_to_buildbot): Modified to accept sent_to_buildbot paramater, and set the value accordingly.
+
 2019-10-23  Truitt Savell  <tsavell@apple.com>