| commit | c3724937a1df3849b15636b12f7eabe9b295d56c | [log] [tgz] |
|---|---|---|
| author | Christian Schneider <cschneid@adobe.com> | Thu Jan 23 15:07:43 2020 +0100 |
| committer | Christian Schneider <cschneid@adobe.com> | Thu Jan 23 15:07:43 2020 +0100 |
| tree | 2d78684aefba8fd9aa01a230160ef995f5a4addb | |
| parent | 02b548be9a0d49928de633c650a04e982659f948 [diff] |
SLING-9020 - Trigger circuit breaker on first error
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableChecker.java b/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableChecker.java index 9123312..d9fee3f 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableChecker.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableChecker.java
@@ -51,7 +51,7 @@ private static final Duration MAX_RETRY_DELAY = Duration.of(5, MINUTES); // Minimal number of errors before journal is considered unavailable - public static final int MIN_ERRORS = 2; + public static final int MIN_ERRORS = 1; private static final Logger LOG = LoggerFactory.getLogger(JournalAvailableChecker.class);
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableCheckerTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableCheckerTest.java index 40c7666..2e07ae0 100644 --- a/src/test/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableCheckerTest.java +++ b/src/test/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableCheckerTest.java
@@ -115,9 +115,6 @@ makeCheckFail(); Event event = createErrorEvent(new IOException("Expected")); checker.handleEvent(event); - await().until(checker::isAvailable); - // Signal second exception to checker to start the checks. Now we should see not available - checker.handleEvent(event); await().until(() -> !checker.isAvailable()); Thread.sleep(1000); // Make sure we get at least one failed doCheck makeCheckSucceed();