You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2023/06/29 11:55:14 UTC

[sling-org-apache-sling-distribution-journal] branch master updated (1495414 -> 93d6192)

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git


    from 1495414  SKYOPS-58233 - Skip the requests with empty paths (#118)
     new e7e3f9d  SLING-11914 - Accept initial offset via PingMessage
     new e7b27d8  SLING-11914 - Update to new parent
     new b06969f  SLING-11914 - Upgrade to new messages
     new 5daf3c9  SLING-11914 - Use correct message
     new 72c7a05  SLING-11914 - Log initial offset
     new 93d6192  SLING-11914 - Improve logging

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            | 38 ++++++++++++++++++++--
 .../journal/bookkeeper/BookKeeper.java             | 14 ++++++++
 .../impl/subscriber/DistributionSubscriber.java    |  9 ++++-
 .../journal/impl/subscriber/SubscriberTest.java    |  7 +++-
 4 files changed, 63 insertions(+), 5 deletions(-)


[sling-org-apache-sling-distribution-journal] 04/06: SLING-11914 - Use correct message

Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit 5daf3c996afcd2ee5bafa99b39f08e17eb26b456
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Wed Jun 28 18:17:16 2023 +0200

    SLING-11914 - Use correct message
---
 pom.xml                                                              | 2 +-
 .../distribution/journal/impl/subscriber/DistributionSubscriber.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6cdbf83..14ffd82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <properties>
         <sling.java.version>8</sling.java.version>
-        <project.build.outputTimestamp>1651650192</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1687958134</project.build.outputTimestamp>
     </properties>
 
     <scm>
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 2e758a4..28c503e 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
@@ -69,6 +69,7 @@ import org.apache.sling.distribution.journal.bookkeeper.BookKeeperFactory;
 import org.apache.sling.distribution.journal.impl.precondition.Precondition;
 import org.apache.sling.distribution.journal.impl.precondition.Precondition.Decision;
 import org.apache.sling.distribution.journal.messages.LogMessage;
+import org.apache.sling.distribution.journal.messages.OffsetMessage;
 import org.apache.sling.distribution.journal.messages.PackageMessage;
 import org.apache.sling.distribution.journal.messages.PackageStatusMessage;
 import org.apache.sling.distribution.journal.messages.PingMessage;
@@ -209,7 +210,7 @@ public class DistributionSubscriber {
         String assign = startOffset > 0 ? messagingProvider.assignTo(startOffset) : null;
 
         packagePoller = messagingProvider.createPoller(topics.getPackageTopic(), Reset.latest, assign,
-                HandlerAdapter.create(PackageMessage.class, this::handlePackageMessage), HandlerAdapter.create(PingMessage.class, this::handlePingMessage));
+                HandlerAdapter.create(PackageMessage.class, this::handlePackageMessage), HandlerAdapter.create(OffsetMessage.class, this::handleOffsetMessage));
 
         queueThread = startBackgroundThread(this::processQueue,
                 format("Queue Processor for Subscriber agent %s", subAgentName));
@@ -283,7 +284,7 @@ public class DistributionSubscriber {
         }
     }
 
-    private <T extends Object> void handlePingMessage(MessageInfo info, PingMessage message) {
+    private void handleOffsetMessage(MessageInfo info, OffsetMessage message) {
         bookKeeper.handleInitialOffset(info.getOffset());
     }
 


[sling-org-apache-sling-distribution-journal] 03/06: SLING-11914 - Upgrade to new messages

Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit b06969f7b203854eb51562a1001e001591ec3a19
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Wed Jun 28 15:14:44 2023 +0200

    SLING-11914 - Upgrade to new messages
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 406ccee..6cdbf83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.distribution.journal.messages</artifactId>
-            <version>0.5.0</version>
+            <version>0.5.1-T20230628-65874b9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>


[sling-org-apache-sling-distribution-journal] 05/06: SLING-11914 - Log initial offset

Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit 72c7a05cb16ca1d61d9be4d2acd85e88c9eef9c2
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Thu Jun 29 09:27:10 2023 +0200

    SLING-11914 - Log initial offset
---
 .../org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
index 76d7b30..92ae9fd 100644
--- a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
+++ b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
@@ -383,6 +383,7 @@ public class BookKeeper {
         try (ResourceResolver resolver = getServiceResolver(SUBSERVICE_BOOKKEEPER)) {
             long currentOffset = loadOffset();
             if (currentOffset == -1) {
+                log.info("Storing initial offset. key={}, offset={}", KEY_OFFSET, offset);
                 storeOffset(resolver, offset);
                 resolver.commit();
             }


[sling-org-apache-sling-distribution-journal] 02/06: SLING-11914 - Update to new parent

Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit e7b27d87295988ddc1db831d9075540782dd55ef
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Tue Jun 27 12:16:27 2023 +0200

    SLING-11914 - Update to new parent
---
 pom.xml | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 830d984..406ccee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>47</version>
+        <version>49</version>
         <relativePath />
     </parent>
 
@@ -82,11 +82,13 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.eventadmin</artifactId>
             <version>1.3.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.healthcheck.api</artifactId>
             <version>2.0.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -96,35 +98,53 @@
         </dependency>
 
         <!-- Apache Sling -->
+        <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.api</artifactId>
+            <version>2.3.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.serviceusermapper</artifactId>
             <version>1.4.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.distribution.api</artifactId>
             <version>0.7.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.scheduler</artifactId>
             <version>2.7.2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.osgi</artifactId>
             <version>2.4.2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.metrics</artifactId>
             <version>1.2.10</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.distribution.core</artifactId>
             <version>0.4.8</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -142,21 +162,25 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.settings</artifactId>
             <version>1.3.8</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.distribution.journal.messages</artifactId>
             <version>0.5.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.discovery.api</artifactId>
             <version>1.0.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.webconsole</artifactId>
             <version>4.3.16</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- OSGi -->
@@ -186,32 +210,38 @@
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-api</artifactId>
             <version>2.16.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
             <version>2.16.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
             <version>3.6.4</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>2.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.6</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -224,11 +254,13 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.jcr-mock</artifactId>
             <version>1.5.4</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
             <version>3.1.2</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>


[sling-org-apache-sling-distribution-journal] 01/06: SLING-11914 - Accept initial offset via PingMessage

Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit e7e3f9dc7ea63d902c5c42ccdad2b0d1a05958cd
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Tue Jun 27 11:17:25 2023 +0200

    SLING-11914 - Accept initial offset via PingMessage
---
 .../sling/distribution/journal/bookkeeper/BookKeeper.java    | 12 ++++++++++++
 .../journal/impl/subscriber/DistributionSubscriber.java      |  8 +++++++-
 .../distribution/journal/impl/subscriber/SubscriberTest.java |  7 ++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
index 0dd7582..76d7b30 100644
--- a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
+++ b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
@@ -379,6 +379,18 @@ public class BookKeeper {
         packageRetries.clear(pubAgentName);
     }
 
+    public void handleInitialOffset(long offset) {
+        try (ResourceResolver resolver = getServiceResolver(SUBSERVICE_BOOKKEEPER)) {
+            long currentOffset = loadOffset();
+            if (currentOffset == -1) {
+                storeOffset(resolver, offset);
+                resolver.commit();
+            }
+        } catch (Exception e) {
+            log.warn("Error storing initial offset={}", offset, e);
+        }
+    }
+
     private void removeFailedPackage(PackageMessage pkgMsg, long offset) throws DistributionException {
         log.info("Removing failed distribution package {} at offset={}", pkgMsg, offset);
         Timer.Context context = distributionMetricsService.getRemovedFailedPackageDuration().time();
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 ad2ebdd..2e758a4 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
@@ -51,6 +51,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.jackrabbit.util.Text;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.commons.metrics.Timer;
 import org.apache.sling.commons.osgi.PropertiesUtil;
 import org.apache.sling.distribution.ImportPostProcessException;
@@ -70,6 +71,7 @@ import org.apache.sling.distribution.journal.impl.precondition.Precondition.Deci
 import org.apache.sling.distribution.journal.messages.LogMessage;
 import org.apache.sling.distribution.journal.messages.PackageMessage;
 import org.apache.sling.distribution.journal.messages.PackageStatusMessage;
+import org.apache.sling.distribution.journal.messages.PingMessage;
 import org.apache.sling.distribution.journal.shared.Delay;
 import org.apache.sling.distribution.journal.shared.DistributionMetricsService;
 import org.apache.sling.distribution.journal.shared.Topics;
@@ -207,7 +209,7 @@ public class DistributionSubscriber {
         String assign = startOffset > 0 ? messagingProvider.assignTo(startOffset) : null;
 
         packagePoller = messagingProvider.createPoller(topics.getPackageTopic(), Reset.latest, assign,
-                HandlerAdapter.create(PackageMessage.class, this::handlePackageMessage));
+                HandlerAdapter.create(PackageMessage.class, this::handlePackageMessage), HandlerAdapter.create(PingMessage.class, this::handlePingMessage));
 
         queueThread = startBackgroundThread(this::processQueue,
                 format("Queue Processor for Subscriber agent %s", subAgentName));
@@ -281,6 +283,10 @@ public class DistributionSubscriber {
         }
     }
 
+    private <T extends Object> void handlePingMessage(MessageInfo info, PingMessage message) {
+        bookKeeper.handleInitialOffset(info.getOffset());
+    }
+
     private boolean shouldEnqueue(MessageInfo info, PackageMessage message) {
         if (!queueNames.contains(message.getPubAgentName())) {
             LOG.info("Skipping distribution package {} at offset={} (not subscribed)", message, info.getOffset());
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 f200da6..bd19e55 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
@@ -87,6 +87,7 @@ import org.apache.sling.distribution.journal.messages.PackageMessage;
 import org.apache.sling.distribution.journal.messages.PackageMessage.ReqType;
 import org.apache.sling.distribution.journal.messages.PackageStatusMessage;
 import org.apache.sling.distribution.journal.messages.PackageStatusMessage.Status;
+import org.apache.sling.distribution.journal.messages.PingMessage;
 import org.apache.sling.distribution.journal.shared.DistributionMetricsService;
 import org.apache.sling.distribution.journal.shared.TestMessageInfo;
 import org.apache.sling.distribution.journal.shared.Topics;
@@ -199,6 +200,9 @@ public class SubscriberTest {
     @Captor
     private ArgumentCaptor<HandlerAdapter<PackageMessage>> packageCaptor;
     
+    @Captor
+    private ArgumentCaptor<HandlerAdapter<PingMessage>> pingCaptor;
+    
     @Captor
     private ArgumentCaptor<HandlerAdapter<ClearCommand>> commandCaptor;
     
@@ -239,7 +243,8 @@ public class SubscriberTest {
                 Mockito.eq(topics.getPackageTopic()),
                 Mockito.eq(Reset.latest), 
                 Mockito.anyString(),
-                packageCaptor.capture()))
+                packageCaptor.capture(),
+                pingCaptor.capture()))
             .thenReturn(poller);
         
         when(clientProvider.createPoller(


[sling-org-apache-sling-distribution-journal] 06/06: SLING-11914 - Improve logging

Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit 93d61924e909baff55214fe121c5a2c99c420a87
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Thu Jun 29 11:20:58 2023 +0200

    SLING-11914 - Improve logging
---
 .../org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
index 92ae9fd..9f6137c 100644
--- a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
+++ b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
@@ -383,7 +383,8 @@ public class BookKeeper {
         try (ResourceResolver resolver = getServiceResolver(SUBSERVICE_BOOKKEEPER)) {
             long currentOffset = loadOffset();
             if (currentOffset == -1) {
-                log.info("Storing initial offset. key={}, offset={}", KEY_OFFSET, offset);
+                log.info("Storing initial offset. packageNodeName={}, subagentName={}, offset={}", 
+                        config.getPackageNodeName(), config.getSubAgentName(), offset);
                 storeOffset(resolver, offset);
                 resolver.commit();
             }