Fix apache#16978 AbstractDelayEvent compare method is incorrect

reele · Jan 23, 2025 · 82279d0 · 82279d0
1 parent 352b47b
commit 82279d0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...duler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEvent.java b/...duler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEvent.java
@@ -39,6 +39,8 @@ public abstract class AbstractDelayEvent implements IEvent, Delayed {
     @Builder.Default
     protected long createTimeInNano = System.nanoTime();
 
+    protected long expiredTimeInNano;
+
     public AbstractDelayEvent() {
         this(DEFAULT_DELAY_TIME);
     }
@@ -50,6 +52,7 @@ public AbstractDelayEvent(final long delayTime) {
     public AbstractDelayEvent(final long delayTime, final long createTimeInNano) {
         this.delayTime = delayTime;
         this.createTimeInNano = createTimeInNano;
+        this.expiredTimeInNano = this.delayTime * 1_000_000 + this.createTimeInNano;
     }
 
     @Override
@@ -60,7 +63,7 @@ public long getDelay(TimeUnit unit) {
 
     @Override
     public int compareTo(Delayed other) {
-        return Long.compare(this.createTimeInNano, ((AbstractDelayEvent) other).createTimeInNano);
+        return Long.compare(this.expiredTimeInNano, ((AbstractDelayEvent) other).expiredTimeInNano);
     }
 
 }