You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by jo...@apache.org on 2024/01/05 13:49:36 UTC
(sling-org-apache-sling-distribution-journal) 01/01: improve log message, improve name of some constants
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch SLING-11928-improve-log-message
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 66b13f095a1254fa5af6a7cb89a579359fac7aa6
Author: Joerg Hoh <jo...@apache.org>
AuthorDate: Fri Jan 5 14:49:23 2024 +0100
improve log message, improve name of some constants
---
.../impl/subscriber/DistributionSubscriber.java | 24 +++++++++++++---------
.../journal/impl/subscriber/SubscriberTest.java | 4 ++--
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
index 5fadcff..1c38d57 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
@@ -23,6 +23,7 @@ import static java.lang.System.currentTimeMillis;
import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.stream.Collectors.toSet;
import static org.apache.sling.distribution.journal.RunnableUtil.startBackgroundThread;
import static org.apache.sling.distribution.journal.messages.PackageMessage.ReqType.INVALIDATE;
@@ -97,11 +98,11 @@ import org.slf4j.LoggerFactory;
@ParametersAreNonnullByDefault
public class DistributionSubscriber {
- private static final long PRECONDITION_TIMEOUT = SECONDS.toMillis(60);
- static long RETRY_DELAY = SECONDS.toMillis(5);
- static long MAX_RETRY_DELAY = MINUTES.toMillis(15);
- static long QUEUE_FETCH_DELAY = SECONDS.toMillis(1);
- private static final Supplier<LongSupplier> catchAllDelays = () -> exponential(RETRY_DELAY, MAX_RETRY_DELAY);
+ private static final long PRECONDITION_TIMEOUT_MILIS = SECONDS.toMillis(60);
+ static long RETRY_DELAY_MILIS = SECONDS.toMillis(5);
+ static long MAX_RETRY_DELAY_MILIS = MINUTES.toMillis(15);
+ static long QUEUE_FETCH_DELAY_MILIS = SECONDS.toMillis(1);
+ private static final Supplier<LongSupplier> catchAllDelays = () -> exponential(RETRY_DELAY_MILIS, MAX_RETRY_DELAY_MILIS);
private static final Logger LOG = LoggerFactory.getLogger(DistributionSubscriber.class);
@@ -324,7 +325,7 @@ public class DistributionSubscriber {
} catch (PreConditionTimeoutException e) {
// Precondition timed out. We only log this on info level as it is no error
LOG.info(e.getMessage());
- delay.await(RETRY_DELAY);
+ delay.await(RETRY_DELAY_MILIS);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
LOG.debug(e.getMessage());
@@ -371,7 +372,7 @@ public class DistributionSubscriber {
if (message != null) {
return message;
} else {
- delay.await(QUEUE_FETCH_DELAY);
+ delay.await(QUEUE_FETCH_DELAY_MILIS);
}
}
throw new InterruptedException("Shutting down");
@@ -410,7 +411,7 @@ public class DistributionSubscriber {
}
private Decision waitPrecondition(long offset) {
- long endTime = System.currentTimeMillis() + PRECONDITION_TIMEOUT;
+ long endTime = System.currentTimeMillis() + PRECONDITION_TIMEOUT_MILIS;
while (System.currentTimeMillis() < endTime && running) {
Decision decision = precondition.canProcess(subAgentName, offset);
if (decision == Decision.WAIT) {
@@ -419,8 +420,11 @@ public class DistributionSubscriber {
return decision;
}
}
- throw new PreConditionTimeoutException(
- "Timeout waiting for distribution package at offset=" + offset + " on status topic");
+ final String msg = String.format("Timeout after %s seconds while waiting to meet the preconditions"
+ + " to import the distribution package at offset %s on topic status",
+ MILLISECONDS.toSeconds(PRECONDITION_TIMEOUT_MILIS),
+ offset);
+ throw new PreConditionTimeoutException(msg);
}
}
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
index ac1cbf2..1b61c46 100644
--- a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
@@ -219,8 +219,8 @@ public class SubscriberTest {
@Before
public void before() throws URISyntaxException {
- DistributionSubscriber.QUEUE_FETCH_DELAY = 100;
- DistributionSubscriber.RETRY_DELAY = 100;
+ DistributionSubscriber.QUEUE_FETCH_DELAY_MILIS = 100;
+ DistributionSubscriber.RETRY_DELAY_MILIS = 100;
Awaitility.setDefaultPollDelay(Duration.ZERO);
Awaitility.setDefaultPollInterval(Duration.ONE_HUNDRED_MILLISECONDS);