From 5abaa67a2462ded0e50345142827ef86143ca930 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 10 Aug 2026 21:39:30 +0530 Subject: [PATCH 01/11] Fix deletion of redirected URLs --- .../AbstractStatusUpdaterBolt.java | 6 +- .../AbstractStatusUpdaterBoltTest.java | 58 +++++++++++++++++-- 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 137035b76..81d7faa7c 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -233,8 +233,10 @@ public void execute(Tuple tuple) { metadata.remove(Constants.STATUS_ERROR_CAUSE); metadata.remove(Constants.STATUS_ERROR_MESSAGE); metadata.remove(Constants.STATUS_ERROR_SOURCE); - } else if (status == Status.ERROR) { - // gone? notify any deleters. Doesn't need to be anchored + } + + if (status == Status.ERROR || status == Status.REDIRECTION) { + // gone or redirected? notify any deleters. Doesn't need to be anchored collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); } diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index d901afb98..802e85a83 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -25,22 +25,23 @@ import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; import org.apache.storm.task.OutputCollector; import org.apache.storm.tuple.Tuple; +import org.apache.stormcrawler.Constants; import org.apache.stormcrawler.Metadata; +import org.apache.stormcrawler.TestOutputCollector; import org.apache.stormcrawler.TestUtil; import org.apache.stormcrawler.util.MetadataTransfer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -/** - * The date passed in {@link AbstractStatusUpdaterBolt#AS_IS_NEXTFETCHDATE_METADATA} comes from the - * metadata and can be anything, so it must be parsed defensively. - */ class AbstractStatusUpdaterBoltTest { + // The date passed in AS_IS_NEXTFETCHDATE_METADATA comes from the metadata and can be anything, + // so it must be parsed defensively. private static final String URL = "http://example.com/"; /** Records what the bolt asked to store. */ @@ -119,4 +120,53 @@ void outOfRangeNextFetchDateIsIgnoredAndTheUrlIsScheduled() { assertEquals(1, bolt.stored, "the URL must still be stored"); assertNotNull(bolt.nextFetch); } + + @Test + void testRedirectedUrlIsEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + Map config = new HashMap<>(); + config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); + config.put( + "scheduler.class", + "org.apache.stormcrawler.persistence.DefaultScheduler"); + + bolt.prepare( + config, + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + + Map tupleValues = new HashMap<>(); + tupleValues.put("url", url); + tupleValues.put("status", Status.REDIRECTION); + tupleValues.put("metadata", metadata); + + Tuple tuple = TestUtil.getMockedTestTuple(tupleValues); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(1, deletions.size()); + assertEquals(url, deletions.get(0).get(0)); + assertEquals(metadata, deletions.get(0).get(1)); + } + + private static class TestStatusUpdaterBolt extends AbstractStatusUpdaterBolt { + + @Override + protected void store( + String url, + Status status, + Metadata metadata, + java.util.Optional nextFetch, + Tuple tuple) { + collector.ack(tuple); + } + } } From af19af7c8a1409de2a7958a9f74dbee6cb7550cc Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Aug 2026 21:22:26 +0530 Subject: [PATCH 02/11] Format redirected URL fix --- .../persistence/AbstractStatusUpdaterBolt.java | 2 +- .../persistence/AbstractStatusUpdaterBoltTest.java | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 81d7faa7c..27225f92a 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -236,7 +236,7 @@ public void execute(Tuple tuple) { } if (status == Status.ERROR || status == Status.REDIRECTION) { - // gone or redirected? notify any deleters. Doesn't need to be anchored + // gone or redirected? notify any deleters. Doesn't need to be anchored collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); } diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index 802e85a83..336bbd075 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -128,14 +128,9 @@ void testRedirectedUrlIsEmittedToDeletionStream() { Map config = new HashMap<>(); config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); - config.put( - "scheduler.class", - "org.apache.stormcrawler.persistence.DefaultScheduler"); + config.put("scheduler.class", "org.apache.stormcrawler.persistence.DefaultScheduler"); - bolt.prepare( - config, - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -149,8 +144,7 @@ void testRedirectedUrlIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); From 373516d3f191477fcbc6c77ddd6aa4c37d50a9ca Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Aug 2026 22:37:38 +0530 Subject: [PATCH 03/11] Handle permanent redirects in deletion stream --- .../AbstractStatusUpdaterBolt.java | 17 +- .../AbstractStatusUpdaterBoltTest.java | 173 ++++++++++++++++-- 2 files changed, 175 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 27225f92a..a43a13ebb 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -235,9 +235,22 @@ public void execute(Tuple tuple) { metadata.remove(Constants.STATUS_ERROR_SOURCE); } - if (status == Status.ERROR || status == Status.REDIRECTION) { - // gone or redirected? notify any deleters. Doesn't need to be anchored + if (status == Status.ERROR) { + // gone? notify any deleters. Doesn't need to be anchored collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); + } else if (status == Status.REDIRECTION) { + String statusCode = metadata.getFirstValue("fetch.statusCode"); + String redirection = metadata.getFirstValue("_redirTo"); + + // Delete permanently redirected URLs (301/308) and meta-refresh redirects. + boolean permanentRedirect = + "301".equals(statusCode) || "308".equals(statusCode); + boolean metaRefreshRedirect = + "200".equals(statusCode) && redirection != null; + + if (permanentRedirect || metaRefreshRedirect) { + collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); + } } // determine the value of the next fetch based on the status diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index 336bbd075..dcb6aeb35 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -122,33 +122,180 @@ void outOfRangeNextFetchDateIsIgnoredAndTheUrlIsScheduled() { } @Test - void testRedirectedUrlIsEmittedToDeletionStream() { + void testPermanentRedirect301IsEmittedToDeletionStream() { TestOutputCollector output = new TestOutputCollector(); TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); - Map config = new HashMap<>(); - config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); - config.put("scheduler.class", "org.apache.stormcrawler.persistence.DefaultScheduler"); + bolt.prepare( + createConfig(), + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "301"); + + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); - bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(1, deletions.size()); + assertEquals(url, deletions.get(0).get(0)); + + Metadata emittedMetadata = (Metadata) deletions.get(0).get(1); + assertEquals("301", emittedMetadata.getFirstValue("fetch.statusCode")); + } + + @Test + void testPermanentRedirect308IsEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + bolt.prepare( + createConfig(), + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "308"); - Map tupleValues = new HashMap<>(); - tupleValues.put("url", url); - tupleValues.put("status", Status.REDIRECTION); - tupleValues.put("metadata", metadata); + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(1, deletions.size()); + assertEquals(url, deletions.get(0).get(0)); + + Metadata emittedMetadata = (Metadata) deletions.get(0).get(1); + assertEquals("308", emittedMetadata.getFirstValue("fetch.statusCode")); + } + + @Test + void testTemporaryRedirect302IsNotEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + bolt.prepare( + createConfig(), + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "302"); + + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(0, deletions.size()); + } + + @Test + void testMetaRefreshRedirectIsEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + bolt.prepare( + createConfig(), + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "200"); + metadata.setValue("_redirTo", "http://example.com/new-page"); - Tuple tuple = TestUtil.getMockedTestTuple(tupleValues); + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); - assertEquals(metadata, deletions.get(0).get(1)); + + Metadata emittedMetadata = (Metadata) deletions.get(0).get(1); + assertEquals( + "http://example.com/new-page", + emittedMetadata.getFirstValue("_redirTo")); + } + + @Test + void testFetchedUrlIsNotEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + bolt.prepare( + createConfig(), + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); + + String url = "http://example.com/page"; + Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "200"); + + Tuple tuple = createTuple(url, Status.FETCHED, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(0, deletions.size()); + } + + @Test + void testErrorIsEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + bolt.prepare( + createConfig(), + TestUtil.getMockedTopologyContext(), + new OutputCollector(output)); + + String url = "http://example.com/error"; + Metadata metadata = new Metadata(); + + Tuple tuple = createTuple(url, Status.ERROR, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(1, deletions.size()); + assertEquals(url, deletions.get(0).get(0)); + } + + private static Map createConfig() { + Map config = new HashMap<>(); + config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); + config.put( + "scheduler.class", + "org.apache.stormcrawler.persistence.DefaultScheduler"); + return config; + } + + private static Tuple createTuple(String url, Status status, Metadata metadata) { + Map tupleValues = new HashMap<>(); + tupleValues.put("url", url); + tupleValues.put("status", status); + tupleValues.put("metadata", metadata); + + return TestUtil.getMockedTestTuple(tupleValues); } private static class TestStatusUpdaterBolt extends AbstractStatusUpdaterBolt { @@ -163,4 +310,4 @@ protected void store( collector.ack(tuple); } } -} +} \ No newline at end of file From 56116e0c6af66f59fca022961280371801c6dbee Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Aug 2026 23:02:26 +0530 Subject: [PATCH 04/11] Fix test file formatting --- .../stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index dcb6aeb35..2185023dc 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -310,4 +310,4 @@ protected void store( collector.ack(tuple); } } -} \ No newline at end of file +} From 519ba6bf556a99d0876f25058230fb5aadb17cd8 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 15 Aug 2026 00:17:45 +0530 Subject: [PATCH 05/11] Format redirect deletion changes --- .../AbstractStatusUpdaterBolt.java | 6 +-- .../AbstractStatusUpdaterBoltTest.java | 50 ++++++------------- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index a43a13ebb..9add491a8 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -243,10 +243,8 @@ public void execute(Tuple tuple) { String redirection = metadata.getFirstValue("_redirTo"); // Delete permanently redirected URLs (301/308) and meta-refresh redirects. - boolean permanentRedirect = - "301".equals(statusCode) || "308".equals(statusCode); - boolean metaRefreshRedirect = - "200".equals(statusCode) && redirection != null; + boolean permanentRedirect = "301".equals(statusCode) || "308".equals(statusCode); + boolean metaRefreshRedirect = "200".equals(statusCode) && redirection != null; if (permanentRedirect || metaRefreshRedirect) { collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index 2185023dc..b2bb60102 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -127,9 +127,7 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); bolt.prepare( - createConfig(), - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -139,8 +137,7 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -155,9 +152,7 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); bolt.prepare( - createConfig(), - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -167,8 +162,7 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -183,9 +177,7 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); bolt.prepare( - createConfig(), - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -195,8 +187,7 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -207,9 +198,7 @@ void testMetaRefreshRedirectIsEmittedToDeletionStream() { TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); bolt.prepare( - createConfig(), - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -220,16 +209,13 @@ void testMetaRefreshRedirectIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); Metadata emittedMetadata = (Metadata) deletions.get(0).get(1); - assertEquals( - "http://example.com/new-page", - emittedMetadata.getFirstValue("_redirTo")); + assertEquals("http://example.com/new-page", emittedMetadata.getFirstValue("_redirTo")); } @Test @@ -238,9 +224,7 @@ void testFetchedUrlIsNotEmittedToDeletionStream() { TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); bolt.prepare( - createConfig(), - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/page"; Metadata metadata = new Metadata(); @@ -250,8 +234,7 @@ void testFetchedUrlIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -262,9 +245,7 @@ void testErrorIsEmittedToDeletionStream() { TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); bolt.prepare( - createConfig(), - TestUtil.getMockedTopologyContext(), - new OutputCollector(output)); + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/error"; Metadata metadata = new Metadata(); @@ -273,8 +254,7 @@ void testErrorIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -283,9 +263,7 @@ void testErrorIsEmittedToDeletionStream() { private static Map createConfig() { Map config = new HashMap<>(); config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); - config.put( - "scheduler.class", - "org.apache.stormcrawler.persistence.DefaultScheduler"); + config.put("scheduler.class", "org.apache.stormcrawler.persistence.DefaultScheduler"); return config; } From 8a0ffd7412aa8782e59022d27a68daaf7cb9b43a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Aug 2026 22:18:49 +0530 Subject: [PATCH 06/11] Make redirect deletion opt-in --- .../AbstractStatusUpdaterBolt.java | 29 +++-- .../AbstractStatusUpdaterBoltTest.java | 122 +++++++++++++++--- 2 files changed, 125 insertions(+), 26 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 9add491a8..225ba15e5 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -71,6 +71,10 @@ public abstract class AbstractStatusUpdaterBolt extends BaseRichBolt { */ public static String roundDateParamName = "status.updater.unit.round.date"; + /** Parameter name to enable deletion of URLs with permanent redirects. */ + public static String deleteRedirectionsParamName = + "status.updater.delete.redirections"; + /** * Key used to pass a preset Date to use as nextFetchDate. The value must represent a valid * instant in UTC and be parsable using {@link DateTimeFormatter#ISO_INSTANT}. This also @@ -94,6 +98,9 @@ public abstract class AbstractStatusUpdaterBolt extends BaseRichBolt { private int roundDateUnit = Calendar.SECOND; + private boolean deleteRedirections = false; + private boolean allowRedirs = true; + @Override public void prepare( Map stormConf, TopologyContext context, OutputCollector collector) { @@ -104,6 +111,12 @@ public void prepare( mdTransfer = MetadataTransfer.getInstance(stormConf); useCache = ConfUtils.getBoolean(stormConf, useCacheParamName, true); + deleteRedirections = + ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); + + allowRedirs = + ConfUtils.getBoolean( + stormConf, Constants.AllowRedirParamName, true); if (useCache) { String spec = ConfUtils.getString(stormConf, cacheConfigParamName); @@ -119,6 +132,7 @@ public void prepare( return v; }, 30); + CrawlerMetrics.registerGauge( context, stormConf, @@ -129,6 +143,7 @@ public void prepare( return v; }, 30); + CrawlerMetrics.registerGauge( context, stormConf, "cache.size", cache::estimatedSize, 30); } @@ -157,7 +172,7 @@ public void execute(Tuple tuple) { // store it again if (potentiallyNew && useCache) { if (cache.getIfPresent(url) != null) { - // no need to add it to the queue + // no need to add the URL to the queue LOG.debug("URL {} already in cache", url); cacheHits++; collector.ack(tuple); @@ -227,6 +242,7 @@ public void execute(Tuple tuple) { if (!status.equals(Status.FETCH_ERROR)) { metadata.remove(Constants.fetchErrorCountParamName); } + // https://github.com/apache/stormcrawler/issues/415 // remove error related key values in case of success if (status.equals(Status.FETCHED) || status.equals(Status.REDIRECTION)) { @@ -238,15 +254,10 @@ public void execute(Tuple tuple) { if (status == Status.ERROR) { // gone? notify any deleters. Doesn't need to be anchored collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); - } else if (status == Status.REDIRECTION) { + } else if (status == Status.REDIRECTION && deleteRedirections && allowRedirs) { String statusCode = metadata.getFirstValue("fetch.statusCode"); - String redirection = metadata.getFirstValue("_redirTo"); - - // Delete permanently redirected URLs (301/308) and meta-refresh redirects. - boolean permanentRedirect = "301".equals(statusCode) || "308".equals(statusCode); - boolean metaRefreshRedirect = "200".equals(statusCode) && redirection != null; - if (permanentRedirect || metaRefreshRedirect) { + if ("301".equals(statusCode) || "308".equals(statusCode)) { collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); } } @@ -303,4 +314,4 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declareStream(Constants.DELETION_STREAM_NAME, new Fields("url", "metadata")); declarer.declareStream(Constants.QUEUE_STREAM_NAME, new Fields("key", "metadata")); } -} +} \ No newline at end of file diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index b2bb60102..010698d98 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -126,8 +126,11 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { TestOutputCollector output = new TestOutputCollector(); TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + Map config = createConfig(); + config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); + bolt.prepare( - createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -137,7 +140,8 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -151,8 +155,11 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { TestOutputCollector output = new TestOutputCollector(); TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + Map config = createConfig(); + config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); + bolt.prepare( - createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -162,7 +169,8 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -176,8 +184,11 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { TestOutputCollector output = new TestOutputCollector(); TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + Map config = createConfig(); + config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); + bolt.prepare( - createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -187,18 +198,22 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @Test - void testMetaRefreshRedirectIsEmittedToDeletionStream() { + void testMetaRefreshRedirectIsNotEmittedToDeletionStream() { TestOutputCollector output = new TestOutputCollector(); TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + Map config = createConfig(); + config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); + bolt.prepare( - createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -209,13 +224,82 @@ void testMetaRefreshRedirectIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); - assertEquals(1, deletions.size()); - assertEquals(url, deletions.get(0).get(0)); + assertEquals(0, deletions.size()); + } - Metadata emittedMetadata = (Metadata) deletions.get(0).get(1); - assertEquals("http://example.com/new-page", emittedMetadata.getFirstValue("_redirTo")); + @Test + void testRedirectionWithoutStatusCodeIsNotEmittedToDeletionStream() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + Map config = createConfig(); + config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); + + bolt.prepare( + config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(0, deletions.size()); + } + + @Test + void testPermanentRedirectIsNotDeletedWhenRedirectionsAreDisabled() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + Map config = createConfig(); + config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); + config.put(Constants.AllowRedirParamName, false); + + bolt.prepare( + config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "301"); + + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(0, deletions.size()); + } + + @Test + void testPermanentRedirectIsNotDeletedByDefault() { + TestOutputCollector output = new TestOutputCollector(); + TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); + + bolt.prepare( + createConfig(), TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + + String url = "http://example.com/old-page"; + Metadata metadata = new Metadata(); + metadata.setValue("fetch.statusCode", "301"); + + Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); + + bolt.execute(tuple); + + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); + + assertEquals(0, deletions.size()); } @Test @@ -234,7 +318,8 @@ void testFetchedUrlIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -254,7 +339,8 @@ void testErrorIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -263,7 +349,9 @@ void testErrorIsEmittedToDeletionStream() { private static Map createConfig() { Map config = new HashMap<>(); config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); - config.put("scheduler.class", "org.apache.stormcrawler.persistence.DefaultScheduler"); + config.put( + "scheduler.class", + "org.apache.stormcrawler.persistence.DefaultScheduler"); return config; } @@ -288,4 +376,4 @@ protected void store( collector.ack(tuple); } } -} +} \ No newline at end of file From 1e17431957d52ca3f1ac1b2537da64d1db455ac3 Mon Sep 17 00:00:00 2001 From: Davide Polato Date: Wed, 19 Aug 2026 14:29:17 +0200 Subject: [PATCH 07/11] Reformat Signed-off-by: Davide Polato --- .../AbstractStatusUpdaterBolt.java | 12 ++--- core/src/main/resources/crawler-default.yaml | 4 ++ .../AbstractStatusUpdaterBoltTest.java | 51 +++++++------------ docs/src/main/asciidoc/configuration.adoc | 1 + 4 files changed, 26 insertions(+), 42 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 225ba15e5..503f5808c 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -72,8 +72,7 @@ public abstract class AbstractStatusUpdaterBolt extends BaseRichBolt { public static String roundDateParamName = "status.updater.unit.round.date"; /** Parameter name to enable deletion of URLs with permanent redirects. */ - public static String deleteRedirectionsParamName = - "status.updater.delete.redirections"; + public static String deleteRedirectionsParamName = "status.updater.delete.redirections"; /** * Key used to pass a preset Date to use as nextFetchDate. The value must represent a valid @@ -111,12 +110,9 @@ public void prepare( mdTransfer = MetadataTransfer.getInstance(stormConf); useCache = ConfUtils.getBoolean(stormConf, useCacheParamName, true); - deleteRedirections = - ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); + deleteRedirections = ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); - allowRedirs = - ConfUtils.getBoolean( - stormConf, Constants.AllowRedirParamName, true); + allowRedirs = ConfUtils.getBoolean(stormConf, Constants.AllowRedirParamName, true); if (useCache) { String spec = ConfUtils.getString(stormConf, cacheConfigParamName); @@ -314,4 +310,4 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declareStream(Constants.DELETION_STREAM_NAME, new Fields("url", "metadata")); declarer.declareStream(Constants.QUEUE_STREAM_NAME, new Fields("key", "metadata")); } -} \ No newline at end of file +} diff --git a/core/src/main/resources/crawler-default.yaml b/core/src/main/resources/crawler-default.yaml index 2e251dd5e..efb2e15f3 100644 --- a/core/src/main/resources/crawler-default.yaml +++ b/core/src/main/resources/crawler-default.yaml @@ -336,6 +336,10 @@ config: # Can also take "MINUTE" or "HOUR" status.updater.unit.round.date: "SECOND" + # Emit permanently redirected URLs (HTTP 301/308) on the deletion stream + # so that they can be removed from the index. Requires redirections.allowed. + status.updater.delete.redirections: false + # configuration for the classes extending AbstractIndexerBolt # indexer.md.filter: "someKey=aValue" indexer.md.docid: "" diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index 010698d98..a23b8693f 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -129,8 +129,7 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { Map config = createConfig(); config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); - bolt.prepare( - config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -140,8 +139,7 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -158,8 +156,7 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { Map config = createConfig(); config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); - bolt.prepare( - config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -169,8 +166,7 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -187,8 +183,7 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { Map config = createConfig(); config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); - bolt.prepare( - config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -198,8 +193,7 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -212,8 +206,7 @@ void testMetaRefreshRedirectIsNotEmittedToDeletionStream() { Map config = createConfig(); config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); - bolt.prepare( - config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -224,8 +217,7 @@ void testMetaRefreshRedirectIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -238,8 +230,7 @@ void testRedirectionWithoutStatusCodeIsNotEmittedToDeletionStream() { Map config = createConfig(); config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); - bolt.prepare( - config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -248,8 +239,7 @@ void testRedirectionWithoutStatusCodeIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -263,8 +253,7 @@ void testPermanentRedirectIsNotDeletedWhenRedirectionsAreDisabled() { config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); config.put(Constants.AllowRedirParamName, false); - bolt.prepare( - config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); + bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); String url = "http://example.com/old-page"; Metadata metadata = new Metadata(); @@ -274,8 +263,7 @@ void testPermanentRedirectIsNotDeletedWhenRedirectionsAreDisabled() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -296,8 +284,7 @@ void testPermanentRedirectIsNotDeletedByDefault() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -318,8 +305,7 @@ void testFetchedUrlIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -339,8 +325,7 @@ void testErrorIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -349,9 +334,7 @@ void testErrorIsEmittedToDeletionStream() { private static Map createConfig() { Map config = new HashMap<>(); config.put(AbstractStatusUpdaterBolt.useCacheParamName, false); - config.put( - "scheduler.class", - "org.apache.stormcrawler.persistence.DefaultScheduler"); + config.put("scheduler.class", "org.apache.stormcrawler.persistence.DefaultScheduler"); return config; } @@ -376,4 +359,4 @@ protected void store( collector.ack(tuple); } } -} \ No newline at end of file +} diff --git a/docs/src/main/asciidoc/configuration.adoc b/docs/src/main/asciidoc/configuration.adoc index ec573a9e6..613ba60fe 100644 --- a/docs/src/main/asciidoc/configuration.adoc +++ b/docs/src/main/asciidoc/configuration.adoc @@ -349,6 +349,7 @@ that is being calculated by a link:https://github.com/apache/stormcrawler/blob/m | max.fetch.errors | 3 | Maximum number of successive fetch errors before changing status to ERROR. | scheduler.class | org.apache.stormcrawler.persistence.DefaultScheduler | Scheduler implementation for computing next fetch dates. Use AdaptiveScheduler for change-rate-based intervals. | status.updater.cache.spec | maximumSize=10000, expireAfterAccess=1h | Cache specification for the status updater. +| status.updater.delete.redirections | false | Whether to emit permanently redirected URLs (HTTP 301/308) on the deletion stream. Requires redirections.allowed. | status.updater.unit.round.date | SECOND | Unit for rounding the next fetch date. Can also be MINUTE or HOUR. | status.updater.use.cache | true | Whether to use cache to avoid re-persisting URLs. |=== From cba6882914fe35f88efef87f38d44e80262b7016 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Aug 2026 22:08:59 +0530 Subject: [PATCH 08/11] Refine permanent redirect deletion --- .../AbstractStatusUpdaterBolt.java | 32 +++++++----- .../stormcrawler/persistence/Status.java | 5 ++ .../AbstractStatusUpdaterBoltTest.java | 50 +++++++------------ .../stormcrawler/persistence/StatusTest.java | 42 ++++++++++++++++ 4 files changed, 84 insertions(+), 45 deletions(-) create mode 100644 core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 503f5808c..1094fc375 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -72,7 +72,8 @@ public abstract class AbstractStatusUpdaterBolt extends BaseRichBolt { public static String roundDateParamName = "status.updater.unit.round.date"; /** Parameter name to enable deletion of URLs with permanent redirects. */ - public static String deleteRedirectionsParamName = "status.updater.delete.redirections"; + public static String deleteRedirectionsParamName = + "status.updater.delete.redirections"; /** * Key used to pass a preset Date to use as nextFetchDate. The value must represent a valid @@ -98,7 +99,6 @@ public abstract class AbstractStatusUpdaterBolt extends BaseRichBolt { private int roundDateUnit = Calendar.SECOND; private boolean deleteRedirections = false; - private boolean allowRedirs = true; @Override public void prepare( @@ -110,9 +110,8 @@ public void prepare( mdTransfer = MetadataTransfer.getInstance(stormConf); useCache = ConfUtils.getBoolean(stormConf, useCacheParamName, true); - deleteRedirections = ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); - - allowRedirs = ConfUtils.getBoolean(stormConf, Constants.AllowRedirParamName, true); + deleteRedirections = + ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); if (useCache) { String spec = ConfUtils.getString(stormConf, cacheConfigParamName); @@ -229,7 +228,8 @@ public void execute(Tuple tuple) { status = Status.ERROR; metadata.setValue(Constants.STATUS_ERROR_CAUSE, "maxFetchErrors"); } else { - metadata.setValue(Constants.fetchErrorCountParamName, Integer.toString(count)); + metadata.setValue( + Constants.fetchErrorCountParamName, Integer.toString(count)); } } @@ -250,19 +250,27 @@ public void execute(Tuple tuple) { if (status == Status.ERROR) { // gone? notify any deleters. Doesn't need to be anchored collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); - } else if (status == Status.REDIRECTION && deleteRedirections && allowRedirs) { + } else if (status == Status.REDIRECTION && deleteRedirections) { String statusCode = metadata.getFirstValue("fetch.statusCode"); - if ("301".equals(statusCode) || "308".equals(statusCode)) { - collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); + if (statusCode != null) { + try { + // Delete URLs that have been permanently redirected. + if (Status.isPermanentRedirect(Integer.parseInt(statusCode))) { + collector.emit( + Constants.DELETION_STREAM_NAME, new Values(url, metadata)); + } + } catch (NumberFormatException e) { + LOG.debug("Invalid HTTP status code: {}", statusCode); + } } } // determine the value of the next fetch based on the status Optional nextFetch = scheduler.schedule(status, metadata); - // filter metadata just before storing it, so that non-persisted - // metadata is available to fetch schedulers + // filter metadata just before storing it, so that non-persisted metadata is available + // to fetch schedulers metadata = mdTransfer.filter(metadata); // round next fetch date - unless it is never @@ -310,4 +318,4 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declareStream(Constants.DELETION_STREAM_NAME, new Fields("url", "metadata")); declarer.declareStream(Constants.QUEUE_STREAM_NAME, new Fields("key", "metadata")); } -} +} \ No newline at end of file diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/Status.java b/core/src/main/java/org/apache/stormcrawler/persistence/Status.java index 140a57059..367eab7ff 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/Status.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/Status.java @@ -38,4 +38,9 @@ public static Status fromHTTPCode(int code) { // error otherwise return Status.FETCH_ERROR; } + + /** Returns true if the HTTP code indicates a permanent redirect. */ + public static boolean isPermanentRedirect(int code) { + return code == 301 || code == 308; + } } diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index a23b8693f..48e1eabab 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -139,7 +139,8 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -166,7 +167,8 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -193,7 +195,8 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -217,7 +220,8 @@ void testMetaRefreshRedirectIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -239,31 +243,8 @@ void testRedirectionWithoutStatusCodeIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); - - assertEquals(0, deletions.size()); - } - - @Test - void testPermanentRedirectIsNotDeletedWhenRedirectionsAreDisabled() { - TestOutputCollector output = new TestOutputCollector(); - TestStatusUpdaterBolt bolt = new TestStatusUpdaterBolt(); - - Map config = createConfig(); - config.put(AbstractStatusUpdaterBolt.deleteRedirectionsParamName, true); - config.put(Constants.AllowRedirParamName, false); - - bolt.prepare(config, TestUtil.getMockedTopologyContext(), new OutputCollector(output)); - - String url = "http://example.com/old-page"; - Metadata metadata = new Metadata(); - metadata.setValue("fetch.statusCode", "301"); - - Tuple tuple = createTuple(url, Status.REDIRECTION, metadata); - - bolt.execute(tuple); - - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -284,7 +265,8 @@ void testPermanentRedirectIsNotDeletedByDefault() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -305,7 +287,8 @@ void testFetchedUrlIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -325,7 +308,8 @@ void testErrorIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = + output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -359,4 +343,4 @@ protected void store( collector.ack(tuple); } } -} +} \ No newline at end of file diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java new file mode 100644 index 000000000..18f18fb4a --- /dev/null +++ b/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.stormcrawler.persistence; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class StatusTest { + + @Test + void testPermanentRedirects() { + assertTrue(Status.isPermanentRedirect(301)); + assertTrue(Status.isPermanentRedirect(308)); + } + + @Test + void testNonPermanentRedirects() { + assertFalse(Status.isPermanentRedirect(300)); + assertFalse(Status.isPermanentRedirect(302)); + assertFalse(Status.isPermanentRedirect(303)); + assertFalse(Status.isPermanentRedirect(307)); + assertFalse(Status.isPermanentRedirect(200)); + assertFalse(Status.isPermanentRedirect(404)); + } +} \ No newline at end of file From e81a4aec638083719cb841f5d3a4c97f0c2da104 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Aug 2026 11:48:18 +0530 Subject: [PATCH 09/11] Fix missing final newlines --- .../stormcrawler/persistence/AbstractStatusUpdaterBolt.java | 2 +- .../stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java | 2 +- .../java/org/apache/stormcrawler/persistence/StatusTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index 1094fc375..db8120495 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -318,4 +318,4 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declareStream(Constants.DELETION_STREAM_NAME, new Fields("url", "metadata")); declarer.declareStream(Constants.QUEUE_STREAM_NAME, new Fields("key", "metadata")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index 48e1eabab..567e67e9c 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -343,4 +343,4 @@ protected void store( collector.ack(tuple); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java index 18f18fb4a..6aa8fb43d 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/StatusTest.java @@ -39,4 +39,4 @@ void testNonPermanentRedirects() { assertFalse(Status.isPermanentRedirect(200)); assertFalse(Status.isPermanentRedirect(404)); } -} \ No newline at end of file +} From b0b6ca2f47e5a5246eec3e34685d57596436f545 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Aug 2026 13:23:53 +0530 Subject: [PATCH 10/11] Trigger CI From 4caa151755608d49f86b8d5334b860e9b21b09fb Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Thu, 10 Sep 2026 13:19:48 +0200 Subject: [PATCH 11/11] Apply code formatting Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_014U6Zqh1d6Z9WF6TAUgk3AE --- .../AbstractStatusUpdaterBolt.java | 12 ++++------ .../AbstractStatusUpdaterBoltTest.java | 24 +++++++------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java index db8120495..d11212b2c 100644 --- a/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java +++ b/core/src/main/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBolt.java @@ -72,8 +72,7 @@ public abstract class AbstractStatusUpdaterBolt extends BaseRichBolt { public static String roundDateParamName = "status.updater.unit.round.date"; /** Parameter name to enable deletion of URLs with permanent redirects. */ - public static String deleteRedirectionsParamName = - "status.updater.delete.redirections"; + public static String deleteRedirectionsParamName = "status.updater.delete.redirections"; /** * Key used to pass a preset Date to use as nextFetchDate. The value must represent a valid @@ -110,8 +109,7 @@ public void prepare( mdTransfer = MetadataTransfer.getInstance(stormConf); useCache = ConfUtils.getBoolean(stormConf, useCacheParamName, true); - deleteRedirections = - ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); + deleteRedirections = ConfUtils.getBoolean(stormConf, deleteRedirectionsParamName, false); if (useCache) { String spec = ConfUtils.getString(stormConf, cacheConfigParamName); @@ -228,8 +226,7 @@ public void execute(Tuple tuple) { status = Status.ERROR; metadata.setValue(Constants.STATUS_ERROR_CAUSE, "maxFetchErrors"); } else { - metadata.setValue( - Constants.fetchErrorCountParamName, Integer.toString(count)); + metadata.setValue(Constants.fetchErrorCountParamName, Integer.toString(count)); } } @@ -257,8 +254,7 @@ public void execute(Tuple tuple) { try { // Delete URLs that have been permanently redirected. if (Status.isPermanentRedirect(Integer.parseInt(statusCode))) { - collector.emit( - Constants.DELETION_STREAM_NAME, new Values(url, metadata)); + collector.emit(Constants.DELETION_STREAM_NAME, new Values(url, metadata)); } } catch (NumberFormatException e) { LOG.debug("Invalid HTTP status code: {}", statusCode); diff --git a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java index 567e67e9c..fdd716fb2 100644 --- a/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java +++ b/core/src/test/java/org/apache/stormcrawler/persistence/AbstractStatusUpdaterBoltTest.java @@ -139,8 +139,7 @@ void testPermanentRedirect301IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -167,8 +166,7 @@ void testPermanentRedirect308IsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0)); @@ -195,8 +193,7 @@ void testTemporaryRedirect302IsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -220,8 +217,7 @@ void testMetaRefreshRedirectIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -243,8 +239,7 @@ void testRedirectionWithoutStatusCodeIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -265,8 +260,7 @@ void testPermanentRedirectIsNotDeletedByDefault() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -287,8 +281,7 @@ void testFetchedUrlIsNotEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(0, deletions.size()); } @@ -308,8 +301,7 @@ void testErrorIsEmittedToDeletionStream() { bolt.execute(tuple); - List> deletions = - output.getEmitted(Constants.DELETION_STREAM_NAME); + List> deletions = output.getEmitted(Constants.DELETION_STREAM_NAME); assertEquals(1, deletions.size()); assertEquals(url, deletions.get(0).get(0));