Apache Solr open-source search software
SOLR-16946: Updated Cluster Singleton plugins are stopped correctly when the Overseer is closed (#1862)
pjmcarthur0619f7873cfc
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex f3f715df647..e5e59103585 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -136,6 +136,8 @@ Bug Fixes* SOLR-16934: Allow Solr to read client (javax.net.ssl.*) trustStores and keyStores via SecurityManager. (Houston Putman)+* SOLR-16946: Updated Cluster Singleton plugins are stopped correctly when the Overseer is closed. (Paul McArthur)+Dependency Upgrades---------------------diff --git a/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java b/solr/core/src/java/org/apache/solr/core/ClusterSingletons.javaindex 6e2c0417818..0c71c853400 100644--- a/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java+++ b/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java@@ -99,8 +99,8 @@ public class ClusterSingletons {@Overridepublic void modified(ContainerPluginsRegistry.ApiInfo old, ContainerPluginsRegistry.ApiInfo replacement) {- added(replacement);deleted(old);+ added(replacement);}};}diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.javaindex 9fdb0936e88..27daaab4d9a 100644--- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java+++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java@@ -220,8 +220,11 @@ public class TestContainerPlugin extends SolrCloudTestCase {MatcherAssert.assertThat(msg, containsString("Cannot find API for the path"));// test ClusterSingleton plugin+ CConfig c6Cfg = new CConfig();+ c6Cfg.strVal = "added";plugin.name = "clusterSingleton";plugin.klass = C6.class.getName();+ plugin.config = c6Cfg;addPlugin.process(cluster.getSolrClient());version = phaser.awaitAdvanceInterruptibly(version, 10, TimeUnit.SECONDS);@@ -233,6 +236,16 @@ public class TestContainerPlugin extends SolrCloudTestCase {assertTrue("startCalled", C6.startCalled);assertFalse("stopCalled", C6.stopCalled);+ // update the clusterSingleton config+ c6Cfg.strVal = "updated";+ postPlugin(singletonMap("update", plugin)).process(cluster.getSolrClient());+ version = phaser.awaitAdvanceInterruptibly(version, 10, TimeUnit.SECONDS);++ assertTrue("stopCalled", C6.stopCalled);++ // Clear stopCalled, it will be verified again when the Overseer Jetty is killed+ C6.stopCalled = false;+assertEquals(CConfig.class, ContainerPluginsRegistry.getConfigClass(new CC()));assertEquals(CConfig.class, ContainerPluginsRegistry.getConfigClass(new CC1()));assertEquals(CConfig.class, ContainerPluginsRegistry.getConfigClass(new CC2()));@@ -394,7 +407,7 @@ public class TestContainerPlugin extends SolrCloudTestCase {@JsonProperty public Boolean boolVal;}- public static class C6 implements ClusterSingleton {+ public static class C6 implements ClusterSingleton, ConfigurablePlugin<CConfig> {static boolean startCalled = false;static boolean stopCalled = false;static boolean ccProvided = false;@@ -430,6 +443,9 @@ public class TestContainerPlugin extends SolrCloudTestCase {stopCalled = true;state = State.STOPPED;}++ @Override+ public void configure(CConfig cfg) {}}public static class C5 implements ResourceLoaderAware {