Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15329 Improve hdfs directory size calculation

Andras Salamon9e27c37b665d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fd6f6a6d971..a4f724e1836 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -120,6 +120,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
a minor performance boost to some cases (e.g. interval facets). Reduced need for Filter.java.
(Michael Gibney, David Smiley)
+* SOLR-15329: Improve HDFS Directory size calculation (Andras Salamon via Mike Drob)
+
Other Changes
----------------------
* SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg)
diff --git a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
index 6b776177d47..59c833bc9fa 100644
--- a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
@@ -452,8 +452,6 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
} catch (IOException e) {
log.error("Error checking if hdfs path exists", e);
throw new SolrException(ErrorCode.SERVER_ERROR, "Error checking if hdfs path exists", e);
- } finally {
- IOUtils.closeQuietly(fileSystem);
}
}
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 5857295d94f..2f88067f4d0 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -478,7 +478,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
if (directoryFactory.exists(getIndexDir())) {
dir = directoryFactory.get(getIndexDir(), DirContext.DEFAULT, solrConfig.indexConfig.lockType);
try {
- size = DirectoryFactory.sizeOfDirectory(dir);
+ size = directoryFactory.size(dir);
} finally {
directoryFactory.release(dir);
}