Add event delay to BitbucketSCMSource (Default: 5s)

Co-authored-by: Gleb Samsonov <[email protected]>

Author: sams-gleb

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java

@@ -133,6 +133,13 @@ public class BitbucketSCMSource extends SCMSource {
     private static final String CLOUD_REPO_TEMPLATE = "{/owner,repo}";
     private static final String SERVER_REPO_TEMPLATE = "/projects{/owner}/repos{/repo}";
 
+    /** How long to delay events received from Bitbucket in order to allow the API caches to sync. */
+    private static /*mostly final*/ int eventDelaySeconds =
+        Math.min(
+            300,
+            Math.max(
+                0, Integer.getInteger(BitbucketSCMSource.class.getName() + ".eventDelaySeconds", 5)));
+
     /**
      * Bitbucket URL.
      */
@@ -1113,6 +1120,27 @@ public SCMHeadOrigin originOf(@NonNull String repoOwner, @NonNull String reposit
         return new SCMHeadOrigin.Fork(repoOwner + "/" + repository);
     }
 
+
+    /**
+     * Returns how long to delay events received from Bitbucket in order to allow the API caches to sync.
+     *
+     * @return how long to delay events received from Bitbucket in order to allow the API caches to sync.
+     */
+    public static int getEventDelaySeconds() {
+        return eventDelaySeconds;
+    }
+
+    /**
+     * Sets how long to delay events received from Bitbucket in order to allow the API caches to sync.
+     *
+     * @param eventDelaySeconds number of seconds to delay, will be restricted into a value within the
+     *     range {@code [0,300]} inclusive
+     */
+    @Restricted(NoExternalUse.class) // to allow configuration from system groovy console
+    public static void setEventDelaySeconds(int eventDelaySeconds) {
+        BitbucketSCMSource.eventDelaySeconds = Math.min(300, Math.max(0, eventDelaySeconds));
+    }
+
     @Symbol("bitbucket")
     @Extension
     public static class DescriptorImpl extends SCMSourceDescriptor {

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/NativeServerPullRequestHookProcessor.java

@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.plugins.git.AbstractGitSCMSource;
@@ -89,7 +90,7 @@ public void process(HookEventType hookEvent, String payload, BitbucketType insta
                 return;
         }
 
-        SCMHeadEvent.fireNow(new HeadEvent(serverUrl, eventType, pullRequestEvent, origin));
+        SCMHeadEvent.fireLater(new HeadEvent(serverUrl, eventType, pullRequestEvent, origin), BitbucketSCMSource.getEventDelaySeconds(), TimeUnit.SECONDS);
     }
 
     private static final class HeadEvent extends NativeServerHeadEvent<NativeServerPullRequestEvent> implements HasPullRequests {

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/NativeServerPushHookProcessor.java

@@ -49,6 +49,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.plugins.git.AbstractGitSCMSource;
@@ -109,7 +110,7 @@ public void process(HookEventType hookEvent, String payload, BitbucketType insta
         }
 
         for (final SCMEvent.Type type : events.keySet()) {
-            SCMHeadEvent.fireNow(new HeadEvent(serverUrl, type, events.get(type), origin, refsChangedEvent));
+            SCMHeadEvent.fireLater(new HeadEvent(serverUrl, type, events.get(type), origin, refsChangedEvent), BitbucketSCMSource.getEventDelaySeconds(), TimeUnit.SECONDS);
         }
     }
 

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/PullRequestHookProcessor.java

@@ -46,6 +46,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import jenkins.plugins.git.AbstractGitSCMSource;
 import jenkins.scm.api.SCMEvent;
@@ -90,7 +91,7 @@ public void process(final HookEventType hookEvent, String payload, final Bitbuck
                         break;
                 }
                 // assume updated as a catch-all type
-                SCMHeadEvent.fireNow(new HeadEvent(eventType, pull, origin, hookEvent, instanceType));
+                SCMHeadEvent.fireLater(new HeadEvent(eventType, pull, origin, hookEvent, instanceType), BitbucketSCMSource.getEventDelaySeconds(), TimeUnit.SECONDS);
             }
         }
     }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/PushHookProcessor.java

@@ -45,6 +45,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.plugins.git.AbstractGitSCMSource;
@@ -86,7 +87,7 @@ public void process(HookEventType hookEvent, String payload, BitbucketType insta
                             type = SCMEvent.Type.UPDATED;
                         }
                     }
-                    SCMHeadEvent.fireNow(new SCMHeadEvent<BitbucketPushEvent>(type, push, origin) {
+                    SCMHeadEvent.fireLater(new SCMHeadEvent<BitbucketPushEvent>(type, push, origin) {
                         @Override
                         public boolean isMatch(@NonNull SCMNavigator navigator) {
                             if (!(navigator instanceof BitbucketSCMNavigator)) {
@@ -187,7 +188,7 @@ public boolean isMatch(@NonNull SCM scm) {
                             // TODO
                             return false;
                         }
-                    });
+                    }, BitbucketSCMSource.getEventDelaySeconds(), TimeUnit.SECONDS);
                 }
             }
         }