mirror of https://github.com/apache/lucene.git
SOLR-9533: Reload core config when a core is reloaded
This commit is contained in:
parent
53507b4e79
commit
2ee723140c
|
@ -585,9 +585,11 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
|
||||||
boolean success = false;
|
boolean success = false;
|
||||||
SolrCore core = null;
|
SolrCore core = null;
|
||||||
try {
|
try {
|
||||||
|
CoreDescriptor cd = new CoreDescriptor(coreDescriptor.getName(), coreDescriptor);
|
||||||
|
cd.loadExtraProperties(); //Reload the extra properties
|
||||||
core = new SolrCore(getName(), getDataDir(), coreConfig.getSolrConfig(),
|
core = new SolrCore(getName(), getDataDir(), coreConfig.getSolrConfig(),
|
||||||
coreConfig.getIndexSchema(), coreConfig.getProperties(),
|
coreConfig.getIndexSchema(), coreConfig.getProperties(),
|
||||||
coreDescriptor, updateHandler, solrDelPolicy, currentCore);
|
cd, updateHandler, solrDelPolicy, currentCore);
|
||||||
|
|
||||||
// we open a new IndexWriter to pick up the latest config
|
// we open a new IndexWriter to pick up the latest config
|
||||||
core.getUpdateHandler().getSolrCoreState().newIndexWriter(core, false);
|
core.getUpdateHandler().getSolrCoreState().newIndexWriter(core, false);
|
||||||
|
|
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership.
|
||||||
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
* (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.solr.core;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileWriter;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
import org.apache.commons.io.FileUtils;
|
||||||
|
import org.apache.solr.SolrTestCaseJ4;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class TestCorePropertiesReload extends SolrTestCaseJ4 {
|
||||||
|
|
||||||
|
private final File solrHomeDirectory = createTempDir().toFile();
|
||||||
|
|
||||||
|
public void setMeUp() throws Exception {
|
||||||
|
FileUtils.copyDirectory(new File(TEST_HOME()), solrHomeDirectory);
|
||||||
|
Properties props = new Properties();
|
||||||
|
props.setProperty("test", "Before reload");
|
||||||
|
writeProperties(props);
|
||||||
|
initCore("solrconfig.xml", "schema.xml", solrHomeDirectory.getAbsolutePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testPropertiesReload() throws Exception {
|
||||||
|
setMeUp();
|
||||||
|
SolrCore core = h.getCore();
|
||||||
|
CoreDescriptor coreDescriptor = core.getCoreDescriptor();
|
||||||
|
String testProp = coreDescriptor.getCoreProperty("test", null);
|
||||||
|
assertTrue(testProp.equals("Before reload"));
|
||||||
|
|
||||||
|
//Re-write the properties file
|
||||||
|
Properties props = new Properties();
|
||||||
|
props.setProperty("test", "After reload");
|
||||||
|
writeProperties(props);
|
||||||
|
|
||||||
|
h.reload();
|
||||||
|
core = h.getCore();
|
||||||
|
coreDescriptor = core.getCoreDescriptor();
|
||||||
|
|
||||||
|
testProp = coreDescriptor.getCoreProperty("test", null);
|
||||||
|
assertTrue(testProp.equals("After reload"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void writeProperties(Properties props) throws Exception {
|
||||||
|
FileWriter out = null;
|
||||||
|
try {
|
||||||
|
File confDir = new File(new File(solrHomeDirectory, "collection1"), "conf");
|
||||||
|
out = new FileWriter(new File(confDir, "solrcore.properties"));
|
||||||
|
props.store(out, "Reload Test");
|
||||||
|
} finally {
|
||||||
|
out.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue