commit 4e7efdf93fd1ddecba56438160d2527f618da364
author Luca Milanesio <luca.milanesio@gmail.com> Tue Nov 14 08:54:14 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 14 08:54:14 2023 +0000
tree fa48d43b24ac3bae155ca5572ca542e0f0f3b9fa
parent e08cc7d04e86f1bcd87017b57fdc24826345acb5
parent cb96b8ec7e879f1ec218cbbdd105e98804fd6c71

Merge "Remove events from beforeStartupEventsQueue in-memory queue" into stable-3.6

src/main/java/com/googlesource/gerrit/plugins/replication/pull/ReplicationQueue.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ReplicationQueue.java
index aafe12f..ef95596 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ReplicationQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ReplicationQueue.java
@@ -546,7 +546,8 @@
 
   private void fireBeforeStartupEvents() {
     Set<String> eventsReplayed = new HashSet<>();
-    for (ReferenceUpdatedEvent event : beforeStartupEventsQueue) {
+    ReferenceUpdatedEvent event;
+    while ((event = beforeStartupEventsQueue.poll()) != null) {
       String eventKey = String.format("%s:%s", event.projectName(), event.refName());
       if (!eventsReplayed.contains(eventKey)) {
         repLog.info("Firing pending task {}", event);