Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15934 CloseHook is now an interface (#538)

Mike Drob4029a925a68f
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 28b080405a1..70c24a4ecad 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -508,6 +508,8 @@ Other Changes
* SOLR-15924: Remove lucene-libs from contrib module packaging. The lucene libraries will be included in lib/ with all other dependencies. (Houston Putman)
+* SOLR-15934: CloseHook is now an interface with default method implementations instead of an abstract class. (Mike Drob)
+
Bug Fixes
---------------------
* SOLR-15849: Fix the connection reset problem caused by the incorrect use of 4LW with \n when monitoring zooKeeper status (Fa Ming).
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java
index acef049bdde..f1b2216e9b7 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java
@@ -56,7 +56,7 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
* <code>totalPoolThreads</code> imposes a contention between the queries if
* <code>(totalPoolThreads &lt; numThreadsPerRequest * total parallel queries)</code>.
*/
-final public class LTRThreadModule extends CloseHook implements NamedListInitializedPlugin {
+public final class LTRThreadModule implements CloseHook, NamedListInitializedPlugin {
public static LTRThreadModule getInstance(NamedList<?> args) {
@@ -165,14 +165,11 @@ final public class LTRThreadModule extends CloseHook implements NamedListInitial
@Override
public void preClose(SolrCore core) {
+ // TODO: Investigate...
+ // All uses of setExecutor use the core container's update executor, which could impact other cores?
ExecutorUtil.shutdownAndAwaitTermination(createWeightScoreExecutor);
}
- @Override
- public void postClose(SolrCore core) {
-
- }
-
public void setExecutor(ExecutorService sharedExecutor) {
this.createWeightScoreExecutor = sharedExecutor;
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 723a49fedc1..6d33b53d2ad 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2414,10 +2414,6 @@ public class ZkController implements Closeable {
public void preClose(SolrCore core) {
unregisterConfListener(confDir, listener);
}
-
- @Override
- public void postClose(SolrCore core) {
- }
});
}
}
diff --git a/solr/core/src/java/org/apache/solr/core/CloseHook.java b/solr/core/src/java/org/apache/solr/core/CloseHook.java
index 812d89a9443..8a91509d8e1 100644
--- a/solr/core/src/java/org/apache/solr/core/CloseHook.java
+++ b/solr/core/src/java/org/apache/solr/core/CloseHook.java
@@ -24,7 +24,7 @@ package org.apache.solr.core;
* The close hook can be useful for releasing objects related to the request handler (for instance, if you have a JDBC DataSource or something like that)
*/
-public abstract class CloseHook {
+public interface CloseHook {
/**
* Method called when the given SolrCore object is closing / shutting down but before the update handler and
@@ -36,7 +36,9 @@ public abstract class CloseHook {
*
* @param core SolrCore object that is shutting down / closing
*/
- public abstract void preClose(SolrCore core);
+ default void preClose(SolrCore core) {
+
+ }
/**
* Method called when the given SolrCore object has been shut down and update handlers and searchers are closed
@@ -48,6 +50,10 @@ public abstract class CloseHook {
* <b>Important:</b> Keep the method implementation as short as possible. If it were to use any heavy i/o , network connections -
* it might be a better idea to launch in a separate Thread so as to not to block the process of
* shutting down a given SolrCore instance.
+ *
+ * @param core SolrCore object that is shutting down / closing
*/
- public abstract void postClose(SolrCore core);
+ default void postClose(SolrCore core) {
+
+ }
}
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 5d8281ad86d..80919c47927 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -3027,11 +3027,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
}
if (deleteInstanceDir) {
addCloseHook(new CloseHook() {
- @Override
- public void preClose(SolrCore core) {
- // empty block
- }
-
@Override
public void postClose(SolrCore core) {
if (desc != null) {
@@ -3262,10 +3257,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
// define the blob
BlobRepository.BlobContentRef<T> blobRef = coreContainer.getBlobRepository().getBlobIncRef(key, decoder);
addCloseHook(new CloseHook() {
- @Override
- public void preClose(SolrCore core) {
- }
-
@Override
public void postClose(SolrCore core) {
coreContainer.getBlobRepository().decrementBlobRefCount(blobRef);
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index f47681c3618..28fb05ac088 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -1403,10 +1403,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
restoreFuture.cancel(false);
}
}
-
- @Override
- public void postClose(SolrCore core) {
- }
};
/**
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index d3a448c5909..9cf57075359 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -144,10 +144,6 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware,
public void preClose(SolrCore core) {
shardHandlerFactory.close();
}
-
- @Override
- public void postClose(SolrCore core) {
- }
});
}
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
index d1d6a8e41c4..aa35e424911 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
@@ -131,10 +131,6 @@ public class SolrSuggester implements Accountable {
log.warn("Could not close the suggester lookup.", e);
}
}
-
- @Override
- public void postClose(SolrCore core) {
- }
});
}
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
index 8d1eb73a909..c7771fe944a 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
@@ -116,9 +116,6 @@ public class Suggester extends SolrSpellChecker {
}
}
}
-
- @Override
- public void postClose(SolrCore core) {}
});
String store = (String)config.get(STORE_DIR);
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index 3ab5b9d5367..a10cc854226 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -343,9 +343,6 @@ class ClosingRequestHandler extends EmptyRequestHandler implements SolrCoreAware
public void preClose(SolrCore core) {
closed = true;
}
-
- @Override
- public void postClose(SolrCore core) {}
});
}
}