#2897: WIP Fix exponential backoff

codecentric · Nov 17, 2023 · 9cc7702 · 9cc7702
1 parent c8681eb
commit 9cc7702
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/...r/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java b/...r/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java
@@ -98,6 +98,7 @@ public StatusUpdateTrigger statusUpdateTrigger(StatusUpdater statusUpdater, Publ
 		StatusUpdateTrigger trigger = new StatusUpdateTrigger(statusUpdater, events);
 		trigger.setInterval(this.adminServerProperties.getMonitor().getStatusInterval());
 		trigger.setLifetime(this.adminServerProperties.getMonitor().getStatusLifetime());
+		trigger.setMaxBackoff(this.adminServerProperties.getMonitor().getStatusMaxBackoff());
 		return trigger;
 	}
 
@@ -132,6 +133,7 @@ public InfoUpdateTrigger infoUpdateTrigger(InfoUpdater infoUpdater, Publisher<In
 		InfoUpdateTrigger trigger = new InfoUpdateTrigger(infoUpdater, events);
 		trigger.setInterval(this.adminServerProperties.getMonitor().getInfoInterval());
 		trigger.setLifetime(this.adminServerProperties.getMonitor().getInfoLifetime());
+		trigger.setMaxBackoff(this.adminServerProperties.getMonitor().getInfoMaxBackoff());
 		return trigger;
 	}
 

diff --git a/...n-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerProperties.java b/...n-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerProperties.java
@@ -103,12 +103,24 @@ public static class MonitorProperties {
 		@DurationUnit(ChronoUnit.MILLIS)
 		private Duration statusLifetime = Duration.ofMillis(10_000L);
 
+		/**
+		 * Time interval representing the maximal backoff for status check retries.
+		 */
+		@DurationUnit(ChronoUnit.MILLIS)
+		private Duration statusMaxBackoff = Duration.ofMillis(10_000L);
+
 		/**
 		 * Time interval to check the info of instances,
 		 */
 		@DurationUnit(ChronoUnit.MILLIS)
 		private Duration infoInterval = Duration.ofMinutes(1L);
 
+		/**
+		 * Time interval representing the maximal backoff for info check retries.
+		 */
+		@DurationUnit(ChronoUnit.MILLIS)
+		private Duration infoMaxBackoff = Duration.ofMinutes(1L);
+
 		/**
 		 * Lifetime of info. The info won't be updated as long the last info isn't
 		 * expired.

diff --git a/...min-server/src/main/java/de/codecentric/boot/admin/server/services/InfoUpdateTrigger.java b/...min-server/src/main/java/de/codecentric/boot/admin/server/services/InfoUpdateTrigger.java
@@ -41,7 +41,7 @@ public class InfoUpdateTrigger extends AbstractEventHandler<InstanceEvent> {
 	public InfoUpdateTrigger(InfoUpdater infoUpdater, Publisher<InstanceEvent> publisher) {
 		super(publisher, InstanceEvent.class);
 		this.infoUpdater = infoUpdater;
-		this.intervalCheck = new IntervalCheck("info", this::updateInfo, Duration.ofMinutes(5), Duration.ofMinutes(1));
+		this.intervalCheck = new IntervalCheck("info", this::updateInfo, Duration.ofMinutes(5), Duration.ofMinutes(1), Duration.ofMinutes(10));
 	}
 
 	@Override
@@ -79,4 +79,7 @@ public void setLifetime(Duration infoLifetime) {
 		this.intervalCheck.setMinRetention(infoLifetime);
 	}
 
+	public void setMaxBackoff(Duration maxBackoff) {
+		this.intervalCheck.setMaxBackoff(maxBackoff);
+	}
 }
diff --git a/...t-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java b/...t-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java
@@ -52,6 +52,9 @@ public class IntervalCheck {
 
 	private final Function<InstanceId, Mono<Void>> checkFn;
 
+	@Setter
+	private Duration maxBackoff;
+
 	@Getter
 	@Setter
 	private Duration interval;
@@ -66,15 +69,16 @@ public class IntervalCheck {
 	private Scheduler scheduler;
 
 	public IntervalCheck(String name, Function<InstanceId, Mono<Void>> checkFn) {
-		this(name, checkFn, Duration.ofSeconds(10), Duration.ofSeconds(10));
+		this(name, checkFn, Duration.ofSeconds(10), Duration.ofSeconds(10), Duration.ofSeconds(60));
 	}
 
 	public IntervalCheck(String name, Function<InstanceId, Mono<Void>> checkFn, Duration interval,
-			Duration minRetention) {
+			Duration minRetention, Duration maxBackoff) {
 		this.name = name;
 		this.checkFn = checkFn;
 		this.interval = interval;
 		this.minRetention = minRetention;
+		this.maxBackoff = maxBackoff;
 	}
 
 	public void start() {

diff --git a/...n-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java b/...n-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java
@@ -81,4 +81,8 @@ public void setLifetime(Duration statusLifetime) {
 		this.intervalCheck.setMinRetention(statusLifetime);
 	}
 
+	public void setMaxBackoff(Duration maxBackoff) {
+		this.intervalCheck.setMaxBackoff(maxBackoff);
+	}
+
 }
diff --git a/...min-server/src/test/java/de/codecentric/boot/admin/server/services/IntervalCheckTest.java b/...min-server/src/test/java/de/codecentric/boot/admin/server/services/IntervalCheckTest.java
@@ -41,7 +41,7 @@ public class IntervalCheckTest {
 	private final Function<InstanceId, Mono<Void>> checkFn = mock(Function.class, (i) -> Mono.empty());
 
 	private final IntervalCheck intervalCheck = new IntervalCheck("test", this.checkFn, Duration.ofMillis(10),
-			Duration.ofMillis(10));
+			Duration.ofMillis(10), Duration.ofMinutes(60));
 
 	@Test
 	public void should_check_after_being_started() throws InterruptedException {