spring-projectsGH-386: Restore interrupted thread status in provided …

…backoff policies
mlichtblau · Oct 16, 2023 · 7647607 · 7647607
1 parent 6af7bc0
commit 7647607
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/src/main/java/org/springframework/retry/backoff/ExponentialBackOffPolicy.java b/src/main/java/org/springframework/retry/backoff/ExponentialBackOffPolicy.java
@@ -245,6 +245,7 @@ public void backOff(BackOffContext backOffContext) throws BackOffInterruptedExce
 			this.sleeper.sleep(sleepTime);
 		}
 		catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 			throw new BackOffInterruptedException("Thread interrupted while sleeping", e);
 		}
 	}

diff --git a/src/main/java/org/springframework/retry/backoff/FixedBackOffPolicy.java b/src/main/java/org/springframework/retry/backoff/FixedBackOffPolicy.java
@@ -97,6 +97,7 @@ protected void doBackOff() throws BackOffInterruptedException {
 			sleeper.sleep(this.backOffPeriod.get());
 		}
 		catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 			throw new BackOffInterruptedException("Thread interrupted while sleeping", e);
 		}
 	}

diff --git a/src/main/java/org/springframework/retry/backoff/UniformRandomBackOffPolicy.java b/src/main/java/org/springframework/retry/backoff/UniformRandomBackOffPolicy.java
@@ -138,6 +138,7 @@ protected void doBackOff() throws BackOffInterruptedException {
 			this.sleeper.sleep(min + delta);
 		}
 		catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 			throw new BackOffInterruptedException("Thread interrupted while sleeping", e);
 		}
 	}

diff --git a/src/test/java/org/springframework/retry/backoff/ExponentialBackOffPolicyTests.java b/src/test/java/org/springframework/retry/backoff/ExponentialBackOffPolicyTests.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Rob Harrop
@@ -92,4 +93,18 @@ public void testMultiBackOff() {
 		}
 	}
 
+	@Test
+	public void testInterruptedStatusIsRestored() {
+		ExponentialBackOffPolicy strategy = new ExponentialBackOffPolicy();
+		strategy.setSleeper(new Sleeper() {
+			@Override
+			public void sleep(long backOffPeriod) throws InterruptedException {
+				throw new InterruptedException("foo");
+			}
+		});
+		BackOffContext context = strategy.start(null);
+		assertThatExceptionOfType(BackOffInterruptedException.class).isThrownBy(() -> strategy.backOff(context));
+		assertThat(Thread.interrupted()).isTrue();
+	}
+
 }
diff --git a/src/test/java/org/springframework/retry/backoff/FixedBackOffPolicyTests.java b/src/test/java/org/springframework/retry/backoff/FixedBackOffPolicyTests.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Rob Harrop
@@ -65,4 +66,19 @@ public void testManyBackOffCalls() {
 		assertThat(sleeper.getBackOffs().length).isEqualTo(10);
 	}
 
+	@Test
+	public void testInterruptedStatusIsRestored() {
+		int backOffPeriod = 50;
+		FixedBackOffPolicy strategy = new FixedBackOffPolicy();
+		strategy.setBackOffPeriod(backOffPeriod);
+		strategy.setSleeper(new Sleeper() {
+			@Override
+			public void sleep(long backOffPeriod) throws InterruptedException {
+				throw new InterruptedException("foo");
+			}
+		});
+		assertThatExceptionOfType(BackOffInterruptedException.class).isThrownBy(() -> strategy.backOff(null));
+		assertThat(Thread.interrupted()).isTrue();
+	}
+
 }
diff --git a/src/test/java/org/springframework/retry/backoff/UniformRandomBackOffPolicyTests.java b/src/test/java/org/springframework/retry/backoff/UniformRandomBackOffPolicyTests.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Tomaz Fernandes
@@ -40,4 +41,23 @@ public void testSetSleeper() {
 		assertThat(withSleeper.getMaxBackOffPeriod()).isEqualTo(maxBackOff);
 	}
 
+
+	@Test
+	public void testInterruptedStatusIsRestored() {
+		UniformRandomBackOffPolicy backOffPolicy = new UniformRandomBackOffPolicy();
+		int minBackOff = 1000;
+		int maxBackOff = 10000;
+		backOffPolicy.setMinBackOffPeriod(minBackOff);
+		backOffPolicy.setMaxBackOffPeriod(maxBackOff);
+		UniformRandomBackOffPolicy withSleeper = backOffPolicy.withSleeper(new Sleeper() {
+			@Override
+			public void sleep(long backOffPeriod) throws InterruptedException {
+				throw new InterruptedException("foo");
+			}
+		});
+
+		assertThatExceptionOfType(BackOffInterruptedException.class).isThrownBy(() -> withSleeper.backOff(null));
+		assertThat(Thread.interrupted()).isTrue();
+	}
+
 }