Apache Solr open-source search software
SOLR-15369: Only load PackageStoreAPI with SolrCloud (#95)
Mike Drobc8cea3ffe4b4
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex fe5cc0f151d..ee93cf6b410 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -281,6 +281,8 @@ Other Changesuse. The Jaeger plugin is now completely configurable via system properties or environment vars,not by values in solr.xml. (David Smiley)+* SOLR-15369: PackageStoreAPI will only be loaded in SolrCloud mode (Mike Drob)+Bug Fixes---------------------* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order executiondiff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex d5536ed82d1..6b003650aa7 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -732,10 +732,6 @@ public class CoreContainer {containerPluginsRegistry.registerListener(clusterSingletons.getPluginRegistryListener());containerPluginsRegistry.registerListener(clusterEventProducerFactory.getPluginRegistryListener());- packageStoreAPI = new PackageStoreAPI(this);- containerHandlers.getApiBag().registerObject(packageStoreAPI.readAPI);- containerHandlers.getApiBag().registerObject(packageStoreAPI.writeAPI);-metricManager = new SolrMetricManager(loader, cfg.getMetricsConfig());String registryName = SolrMetricManager.getRegistryName(SolrInfoBean.Group.node);solrMetricsContext = new SolrMetricsContext(metricManager, registryName, metricTag);@@ -774,6 +770,11 @@ public class CoreContainer {(PublicKeyHandler) containerHandlers.get(PublicKeyHandler.PATH));// use deprecated API for back-compat, remove in 9.0pkiAuthenticationPlugin.initializeMetrics(solrMetricsContext, "/authentication/pki");++ packageStoreAPI = new PackageStoreAPI(this);+ containerHandlers.getApiBag().registerObject(packageStoreAPI.readAPI);+ containerHandlers.getApiBag().registerObject(packageStoreAPI.writeAPI);+packageLoader = new PackageLoader(this);containerHandlers.getApiBag().registerObject(packageLoader.getPackageAPI().editAPI);containerHandlers.getApiBag().registerObject(packageLoader.getPackageAPI().readAPI);diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.javaindex 62d73e9eebf..d932e507f58 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java@@ -74,6 +74,10 @@ public class PackageAPI {public final Read readAPI = new Read();public PackageAPI(CoreContainer coreContainer, PackageLoader loader) {+ if (coreContainer.getPackageStoreAPI() == null) {+ throw new IllegalStateException("Must successfully load PackageStoreAPI first");+ }+this.coreContainer = coreContainer;this.packageLoader = loader;pkgs = new Packages();diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 2e908ef7458..af6545c0b7a 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -81,14 +81,28 @@ import static org.apache.solr.filestore.TestDistribPackageStore.*;public class TestPackages extends SolrCloudTestCase {@Before- public void setup() {+ @Override+ public void setUp() throws Exception {+ super.setUp();System.setProperty("enable.packages", "true");+ configureCluster(4)+ .withJettyConfig(jetty -> jetty.enableV2(true))+ .addConfig("conf", configset("conf2"))+ .addConfig("conf1", configset("schema-package"))+ .configure();}-+@After- public void teardown() {+ @Override+ public void tearDown() throws Exception {+ if (cluster != null) {+ cluster.shutdown();+ }System.clearProperty("enable.packages");++ super.tearDown();}+public static class ConfigPlugin implements ReflectMapWriter {@JsonPropertypublic String name;@@ -99,12 +113,6 @@ public class TestPackages extends SolrCloudTestCase {public void testCoreReloadingPlugin() throws Exception {- MiniSolrCloudCluster cluster =- configureCluster(4)- .withJettyConfig(jetty -> jetty.enableV2(true))- .addConfig("conf", configset("conf2"))- .configure();- try {String FILE1 = "/mypkg/runtimelibs.jar";String COLLECTION_NAME = "testCoreReloadingPluginColl";byte[] derFile = readFile("cryptokeys/pub_key512.der");@@ -155,19 +163,10 @@ public class TestPackages extends SolrCloudTestCase {verifyComponent(cluster.getSolrClient(),COLLECTION_NAME, "query", "filterCache","mypkg", "2.0" );- } finally {- cluster.shutdown();- }}@Test@SuppressWarnings({"unchecked"})public void testPluginLoading() throws Exception {- MiniSolrCloudCluster cluster =- configureCluster(4)- .withJettyConfig(jetty -> jetty.enableV2(true))- .addConfig("conf", configset("cloud-minimal"))- .configure();- try {String FILE1 = "/mypkg/runtimelibs.jar";String FILE2 = "/mypkg/runtimelibs_v2.jar";String FILE3 = "/mypkg/runtimelibs_v3.jar";@@ -500,9 +499,6 @@ public class TestPackages extends SolrCloudTestCase {checkAllNodesForFile(cluster,FILE3,Utils.makeMap(":files:" + FILE3 + ":name", "runtimelibs_v3.jar"),false);- } finally {- cluster.shutdown();- }}@SuppressWarnings({"unchecked","rawtypes"})private void executeReq(String uri, JettySolrRunner jetty, Utils.InputStreamConsumer parser, Map expected) throws Exception {@@ -539,13 +535,6 @@ public class TestPackages extends SolrCloudTestCase {@Testpublic void testAPI() throws Exception {- System.setProperty("enable.packages", "true");- MiniSolrCloudCluster cluster =- configureCluster(4)- .withJettyConfig(jetty -> jetty.enableV2(true))- .addConfig("conf", configset("cloud-minimal"))- .configure();- try {String errPath = "/error/details[0]/errorMessages[0]";String FILE1 = "/mypkg/v.0.12/jar_a.jar";String FILE2 = "/mypkg/v.0.12/jar_b.jar";@@ -660,9 +649,6 @@ public class TestPackages extends SolrCloudTestCase {":result:packages:test_pkg[0]:files[0]", FILE3));}- } finally {- cluster.shutdown();- }}public static class C extends RequestHandlerBase implements SolrCoreAware {static boolean informCalled = false;@@ -704,12 +690,6 @@ public class TestPackages extends SolrCloudTestCase {String COLLECTION_NAME = "testSchemaLoadingColl";System.setProperty("managed.schema.mutable", "true");- MiniSolrCloudCluster cluster =- configureCluster(4)- .withJettyConfig(jetty -> jetty.enableV2(true))- .addConfig("conf1", configset("schema-package"))- .configure();- try {String FILE1 = "/schemapkg/schema-plugins.jar";byte[] derFile = readFile("cryptokeys/pub_key512.der");uploadKey(derFile, PackageStoreAPI.KEYS_DIR+"/pub_key512.der", cluster);@@ -774,11 +754,6 @@ public class TestPackages extends SolrCloudTestCase {Utils.makeMap(":fieldType:analyzer:charFilters[0]:_packageinfo_:version" ,"2.0",":fieldType:analyzer:tokenizer:_packageinfo_:version","2.0",":fieldType:_packageinfo_:version","2.0"));-- } finally {- cluster.shutdown();- }-}@SuppressWarnings({"rawtypes","unchecked"})private void verifySchemaComponent(SolrClient client, String COLLECTION_NAME, String path,