From a38d07f94b8818b7415939e1c30472739b27e128 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 17 Jan 2025 09:51:49 -0500 Subject: [PATCH 1/4] Deprecate HDFS Module with warning about removal in Solr 10 --- .../src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java | 5 +++++ .../modules/deployment-guide/pages/solr-on-hdfs.adoc | 2 ++ 2 files changed, 7 insertions(+) diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java index dade59c1b62..b6cff5b50d8 100644 --- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java +++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java @@ -79,6 +79,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * + * @deprecated The Solr HDFS Module will be removed in Solr 10 with no replacement. + */ +@Deprecated(forRemoval = true,since = "9.9") public class HdfsDirectoryFactory extends CachingDirectoryFactory implements SolrCoreAware, SolrMetricProducer { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc index f2b7f5a4f63..f8214e75c1f 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc @@ -20,6 +20,8 @@ The Solr HDFS Module has support for writing and reading Solr's index and transaction log files to the HDFS distributed filesystem. It does not use Hadoop MapReduce to process Solr data. +IMPORTANT: The HDFS Module has been deprecated and will be retired in Solr 10. + To use HDFS rather than a local filesystem, you must be using Hadoop 2.x and you will need to instruct Solr to use the `HdfsDirectoryFactory`. There are also several additional parameters to define. These can be set in one of three ways: From 7817066c974665958a979218c531aab77b9ee945 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 17 Jan 2025 11:15:50 -0500 Subject: [PATCH 2/4] Update solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc Co-authored-by: Houston Putman --- .../modules/deployment-guide/pages/solr-on-hdfs.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc index f8214e75c1f..13bb543bd3d 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc @@ -20,7 +20,7 @@ The Solr HDFS Module has support for writing and reading Solr's index and transaction log files to the HDFS distributed filesystem. It does not use Hadoop MapReduce to process Solr data. -IMPORTANT: The HDFS Module has been deprecated and will be retired in Solr 10. +IMPORTANT: The HDFS Module has been deprecated and will be removed in Solr 10. To use HDFS rather than a local filesystem, you must be using Hadoop 2.x and you will need to instruct Solr to use the `HdfsDirectoryFactory`. There are also several additional parameters to define. From cbaca597f10f29361ccccaa3671fbb6b50bf0b5e Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 17 Jan 2025 11:28:16 -0500 Subject: [PATCH 3/4] While we will remove it, allow our code to compile for now --- .../src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java index b6cff5b50d8..a5205d26763 100644 --- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java +++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java @@ -83,7 +83,7 @@ * * @deprecated The Solr HDFS Module will be removed in Solr 10 with no replacement. */ -@Deprecated(forRemoval = true,since = "9.9") +@Deprecated(since = "9.9") public class HdfsDirectoryFactory extends CachingDirectoryFactory implements SolrCoreAware, SolrMetricProducer { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); From fd823b40047eccc0f0114aa52c7747633ac183b0 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Sun, 16 Feb 2025 11:52:47 -0500 Subject: [PATCH 4/4] lint --- .../hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java | 1 - 1 file changed, 1 deletion(-) diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java index a5205d26763..67464d230db 100644 --- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java +++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java @@ -80,7 +80,6 @@ import org.slf4j.LoggerFactory; /** - * * @deprecated The Solr HDFS Module will be removed in Solr 10 with no replacement. */ @Deprecated(since = "9.9")