Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11122: Creating a core should write a core.properties file first and clean up on failure

This commit is contained in:
Erick Erickson 2017-07-19 22:17:54 -07:00
parent 227eeefcd0
commit 4041f8a1c9
3 changed files with 163 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -98,6 +98,9 @@ Other Changes
* SOLR-11106: TestLBHttpSolrClient.testReliablity takes 30 seconds because of the wrong server name * SOLR-11106: TestLBHttpSolrClient.testReliablity takes 30 seconds because of the wrong server name
(Kensho Hirasawa via Erick Erickson) (Kensho Hirasawa via Erick Erickson)
* SOLR-11122: Creating a core should write a core.properties file first and clean up on failure
(Erick Erickson)
================== 7.0.0 ================== ================== 7.0.0 ==================

28
solr/core/src/java/org/apache/solr/core/CoreContainer.java
View File

@ -607,7 +607,7 @@ public class CoreContainer {
zkSys.getZkController().throwErrorIfReplicaReplaced(cd); zkSys.getZkController().throwErrorIfReplicaReplaced(cd);
} }
core = create(cd, false, false); core = createFromDescriptor(cd, false, false);
} finally { } finally {
if (asyncSolrCoreLoad) { if (asyncSolrCoreLoad) {
solrCores.markCoreAsNotLoading(cd); solrCores.markCoreAsNotLoading(cd);
@ -901,14 +901,17 @@ public class CoreContainer {
preExisitingZkEntry = getZkController().checkIfCoreNodeNameAlreadyExists(cd); preExisitingZkEntry = getZkController().checkIfCoreNodeNameAlreadyExists(cd);
} }
SolrCore core = create(cd, true, newCollection); // Much of the logic in core handling pre-supposes that the core.properties file already exists, so create it
// first and clean it up if there's an error.
// only write out the descriptor if the core is successfully created
coresLocator.create(this, cd); coresLocator.create(this, cd);
SolrCore core = createFromDescriptor(cd, true, newCollection);
return core; return core;
} } catch (Exception ex) {
catch (Exception ex) { // First clean up any core descriptor, there should never be an existing core.properties file for any core that
// failed to be created on-the-fly.
coresLocator.delete(this, cd);
if (isZooKeeperAware() && !preExisitingZkEntry) { if (isZooKeeperAware() && !preExisitingZkEntry) {
try { try {
getZkController().unregister(coreName, cd); getZkController().unregister(coreName, cd);
@ -948,7 +951,7 @@ public class CoreContainer {
* *
* @return the newly created core * @return the newly created core
*/ */
private SolrCore create(CoreDescriptor dcore, boolean publishState, boolean newCollection) { private SolrCore createFromDescriptor(CoreDescriptor dcore, boolean publishState, boolean newCollection) {
if (isShutDown) { if (isShutDown) {
throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Solr has been shutdown."); throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Solr has been shutdown.");
@ -1225,7 +1228,7 @@ public class CoreContainer {
} else { } else {
CoreLoadFailure clf = coreInitFailures.get(name); CoreLoadFailure clf = coreInitFailures.get(name);
if (clf != null) { if (clf != null) {
create(clf.cd, true, false); createFromDescriptor(clf.cd, true, false);
} else { } else {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "No such core: " + name ); throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "No such core: " + name );
} }
@ -1408,7 +1411,7 @@ public class CoreContainer {
if (zkSys.getZkController() != null) { if (zkSys.getZkController() != null) {
zkSys.getZkController().throwErrorIfReplicaReplaced(desc); zkSys.getZkController().throwErrorIfReplicaReplaced(desc);
} }
core = create(desc, true, false); // This should throw an error if it fails. core = createFromDescriptor(desc, true, false); // This should throw an error if it fails.
} }
core.open(); core.open();
} }
@ -1556,7 +1559,12 @@ public class CoreContainer {
public long getStatus() { public long getStatus() {
return status; return status;
} }
// Occasaionally we need to access the transient cache handler in places other than coreContainer.
public TransientSolrCoreCache getTransientCache() {
return solrCores.getTransientCacheHandler();
}
} }
class CloserThread extends Thread { class CloserThread extends Thread {

188
solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
View File

@ -17,12 +17,17 @@
package org.apache.solr.core; package org.apache.solr.core;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Writer; import java.io.Writer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@ -47,15 +52,15 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
initCore(); initCore();
} }
private final File solrHomeDirectory = createTempDir().toFile(); private final Path solrHomeDirectory = createTempDir();
private void setMeUp(String alternateCoreDir) throws Exception { private void setMeUp(String alternateCoreDir) throws Exception {
System.setProperty("solr.solr.home", solrHomeDirectory.getAbsolutePath()); System.setProperty("solr.solr.home", solrHomeDirectory.toAbsolutePath().toString());
String xmlStr = SOLR_XML; String xmlStr = SOLR_XML;
if (alternateCoreDir != null) { if (alternateCoreDir != null) {
xmlStr = xmlStr.replace("<solr>", "<solr> <str name=\"coreRootDirectory\">" + alternateCoreDir + "</str> "); xmlStr = xmlStr.replace("<solr>", "<solr> <str name=\"coreRootDirectory\">" + alternateCoreDir + "</str> ");
} }
File tmpFile = new File(solrHomeDirectory, SolrXmlConfig.SOLR_XML_FILE); File tmpFile = new File(solrHomeDirectory.toFile(), SolrXmlConfig.SOLR_XML_FILE);
FileUtils.write(tmpFile, xmlStr, IOUtils.UTF_8); FileUtils.write(tmpFile, xmlStr, IOUtils.UTF_8);
} }
@ -64,7 +69,7 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
setMeUp(null); setMeUp(null);
} }
private Properties makeCorePropFile(String name, boolean isTransient, boolean loadOnStartup, String... extraProps) { private Properties makeCoreProperties(String name, boolean isTransient, boolean loadOnStartup, String... extraProps) {
Properties props = new Properties(); Properties props = new Properties();
props.put(CoreDescriptor.CORE_NAME, name); props.put(CoreDescriptor.CORE_NAME, name);
props.put(CoreDescriptor.CORE_SCHEMA, "schema-tiny.xml"); props.put(CoreDescriptor.CORE_SCHEMA, "schema-tiny.xml");
@ -89,14 +94,12 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
} finally { } finally {
out.close(); out.close();
} }
addConfFiles(new File(propFile.getParent(), "conf")); addConfFiles(new File(propFile.getParent(), "conf"));
} }
private void addCoreWithProps(String name, Properties stockProps) throws Exception { private void addCoreWithProps(String name, Properties stockProps) throws Exception {
File propFile = new File(new File(solrHomeDirectory, name), CorePropertiesLocator.PROPERTIES_FILENAME); File propFile = new File(new File(solrHomeDirectory.toFile(), name), CorePropertiesLocator.PROPERTIES_FILENAME);
File parent = propFile.getParentFile(); File parent = propFile.getParentFile();
assertTrue("Failed to mkdirs for " + parent.getAbsolutePath(), parent.mkdirs()); assertTrue("Failed to mkdirs for " + parent.getAbsolutePath(), parent.mkdirs());
addCoreWithProps(stockProps, propFile); addCoreWithProps(stockProps, propFile);
@ -142,12 +145,12 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
setMeUp(); setMeUp();
// name, isLazy, loadOnStartup // name, isLazy, loadOnStartup
addCoreWithProps("core1", makeCorePropFile("core1", false, true, "dataDir=core1")); addCoreWithProps("core1", makeCoreProperties("core1", false, true, "dataDir=core1"));
addCoreWithProps("core2", makeCorePropFile("core2", false, false, "dataDir=core2")); addCoreWithProps("core2", makeCoreProperties("core2", false, false, "dataDir=core2"));
// I suspect what we're adding in here is a "configset" rather than a schema or solrconfig. // I suspect what we're adding in here is a "configset" rather than a schema or solrconfig.
// //
addCoreWithProps("lazy1", makeCorePropFile("lazy1", true, false, "dataDir=lazy1")); addCoreWithProps("lazy1", makeCoreProperties("lazy1", true, false, "dataDir=lazy1"));
CoreContainer cc = init(); CoreContainer cc = init();
try { try {
@ -172,6 +175,34 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
assertEquals("schema-tiny.xml", desc.getSchemaName()); assertEquals("schema-tiny.xml", desc.getSchemaName());
TestLazyCores.checkInCores(cc, "core1", "core2", "lazy1"); TestLazyCores.checkInCores(cc, "core1", "core2", "lazy1");
// Can we persist an existing core's properties?
// Insure we can persist a new properties file if we want.
CoreDescriptor cd1 = core1.getCoreDescriptor();
Properties persistable = cd1.getPersistableUserProperties();
persistable.setProperty("bogusprop", "bogusval");
cc.getCoresLocator().persist(cc, cd1);
File propFile = new File(new File(solrHomeDirectory.toFile(), "core1"), CorePropertiesLocator.PROPERTIES_FILENAME);
Properties newProps = new Properties();
try (InputStreamReader is = new InputStreamReader(new FileInputStream(propFile), StandardCharsets.UTF_8)) {
newProps.load(is);
}
// is it there?
assertEquals("Should have persisted bogusprop to disk", "bogusval", newProps.getProperty("bogusprop"));
// is it in the user properties?
CorePropertiesLocator cpl = new CorePropertiesLocator(solrHomeDirectory);
List<CoreDescriptor> cores = cpl.discover(cc);
boolean found = false;
for (CoreDescriptor cd : cores) {
if (cd.getName().equals("core1")) {
found = true;
assertEquals("Should have persisted bogusprop to disk in user properties",
"bogusval",
cd.getPersistableUserProperties().getProperty("bogusprop"));
break;
}
}
assertTrue("Should have found core descriptor for core1", found);
} }
} finally { } finally {
@ -179,6 +210,71 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
} }
} }
@Test
public void testPropFilePersistence() throws Exception {
setMeUp();
// Test that an existing core.properties file is _not_ deleted if the core fails to load.
Properties badProps = makeCoreProperties("corep1", false, true);
badProps.setProperty(CoreDescriptor.CORE_SCHEMA, "not-there.xml");
addCoreWithProps("corep1", badProps);
// Sanity check that a core did get loaded
addCoreWithProps("corep2", makeCoreProperties("corep2", false, true));
Path coreP1PropFile = Paths.get(solrHomeDirectory.toString(), "corep1", "core.properties");
assertTrue("Core.properties file should exist for before core load failure core corep1",
Files.exists(coreP1PropFile));
CoreContainer cc = init();
try {
try {
cc.getCore("corep1");
fail("Should have thrown exception");
} catch (SolrCoreInitializationException scie) {
assertTrue(scie.getMessage().contains("init failure"));
}
try (SolrCore sc = cc.getCore("corep2")) {
assertNotNull("Core corep2 should be loaded", sc);
}
assertTrue("Core.properties file should still exist for core corep1", Files.exists(coreP1PropFile));
// Creating a core successfully should create a core.properties file
Path corePropFile = Paths.get(solrHomeDirectory.toString(), "corep3", "core.properties");
assertFalse("Should not be a properties file yet", Files.exists(corePropFile));
cc.create("corep3", ImmutableMap.of("configSet", "minimal"));
assertTrue("Should be a properties file for newly created core", Files.exists(corePropFile));
// Failing to create a core should _not_ leave a core.properties file hanging around.
corePropFile = Paths.get(solrHomeDirectory.toString(), "corep4", "core.properties");
assertFalse("Should not be a properties file yet for corep4", Files.exists(corePropFile));
try {
cc.create("corep4", ImmutableMap.of(
CoreDescriptor.CORE_NAME, "corep4",
CoreDescriptor.CORE_SCHEMA, "not-there.xml",
CoreDescriptor.CORE_CONFIG, "solrconfig-minimal.xml",
CoreDescriptor.CORE_TRANSIENT, "false",
CoreDescriptor.CORE_LOADONSTARTUP, "true"));
fail("Should have thrown exception getting core ");
} catch (SolrException se) {
assertTrue(se.getMessage().contains("Can't find resource"));
}
assertFalse("Failed corep4 should not have left a core.properties file around", Files.exists(corePropFile));
// Finally, just for yucks, let's determine that a this create path also leaves a prop file.
corePropFile = Paths.get(solrHomeDirectory.toString(), "corep5", "core.properties");
assertFalse("Should not be a properties file yet for corep5", Files.exists(corePropFile));
cc.create("corep5", ImmutableMap.of("configSet", "minimal"));
assertTrue("corep5 should have left a core.properties file on disk", Files.exists(corePropFile));
} finally {
cc.shutdown();
}
}
// Insure that if the number of transient cores that are loaded on startup is greater than the cache size that Solr // Insure that if the number of transient cores that are loaded on startup is greater than the cache size that Solr
@ -199,16 +295,16 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
setMeUp(); setMeUp();
// name, isLazy, loadOnStartup // name, isLazy, loadOnStartup
addCoreWithProps("coreLOS", makeCorePropFile("coreLOS", false, true, "dataDir=coreLOS")); addCoreWithProps("coreLOS", makeCoreProperties("coreLOS", false, true, "dataDir=coreLOS"));
addCoreWithProps("coreT1", makeCorePropFile("coreT1", true, true, "dataDir=coreT1")); addCoreWithProps("coreT1", makeCoreProperties("coreT1", true, true, "dataDir=coreT1"));
addCoreWithProps("coreT2", makeCorePropFile("coreT2", true, true, "dataDir=coreT2")); addCoreWithProps("coreT2", makeCoreProperties("coreT2", true, true, "dataDir=coreT2"));
addCoreWithProps("coreT3", makeCorePropFile("coreT3", true, true, "dataDir=coreT3")); addCoreWithProps("coreT3", makeCoreProperties("coreT3", true, true, "dataDir=coreT3"));
addCoreWithProps("coreT4", makeCorePropFile("coreT4", true, true, "dataDir=coreT4")); addCoreWithProps("coreT4", makeCoreProperties("coreT4", true, true, "dataDir=coreT4"));
addCoreWithProps("coreT5", makeCorePropFile("coreT5", true, true, "dataDir=coreT5")); addCoreWithProps("coreT5", makeCoreProperties("coreT5", true, true, "dataDir=coreT5"));
addCoreWithProps("coreT6", makeCorePropFile("coreT6", true, true, "dataDir=coreT6")); addCoreWithProps("coreT6", makeCoreProperties("coreT6", true, true, "dataDir=coreT6"));
// Do this specially since we need to search. // Do this specially since we need to search.
final CoreContainer cc = new CoreContainer(solrHomeDirectory.getPath().toString()); final CoreContainer cc = new CoreContainer(solrHomeDirectory.toString());
try { try {
cc.load(); cc.load();
// Just check that the proper number of cores are loaded since making the test depend on order would be fragile // Just check that the proper number of cores are loaded since making the test depend on order would be fragile
@ -246,8 +342,8 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
setMeUp(); setMeUp();
// name, isLazy, loadOnStartup // name, isLazy, loadOnStartup
addCoreWithProps("core1", makeCorePropFile("core1", false, true)); addCoreWithProps("core1", makeCoreProperties("core1", false, true));
addCoreWithProps("core2", makeCorePropFile("core2", false, false, "name=core1")); addCoreWithProps("core2", makeCoreProperties("core2", false, false, "name=core1"));
CoreContainer cc = null; CoreContainer cc = null;
try { try {
cc = init(); cc = init();
@ -274,9 +370,9 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
File alt = createTempDir().toFile(); File alt = createTempDir().toFile();
setMeUp(alt.getAbsolutePath()); setMeUp(alt.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true, "dataDir=core1"), addCoreWithProps(makeCoreProperties("core1", false, true, "dataDir=core1"),
new File(alt, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(alt, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
addCoreWithProps(makeCorePropFile("core2", false, false, "dataDir=core2"), addCoreWithProps(makeCoreProperties("core2", false, false, "dataDir=core2"),
new File(alt, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(alt, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
CoreContainer cc = init(); CoreContainer cc = init();
try (SolrCore core1 = cc.getCore("core1"); try (SolrCore core1 = cc.getCore("core1");
@ -295,13 +391,13 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
setMeUp(relative); setMeUp(relative);
// two cores under the relative directory // two cores under the relative directory
addCoreWithProps(makeCorePropFile("core1", false, true, "dataDir=core1"), addCoreWithProps(makeCoreProperties("core1", false, true, "dataDir=core1"),
solrHomeDirectory.toPath().resolve(relative).resolve("core1").resolve(CorePropertiesLocator.PROPERTIES_FILENAME).toFile()); solrHomeDirectory.resolve(relative).resolve("core1").resolve(CorePropertiesLocator.PROPERTIES_FILENAME).toFile());
addCoreWithProps(makeCorePropFile("core2", false, false, "dataDir=core2"), addCoreWithProps(makeCoreProperties("core2", false, false, "dataDir=core2"),
solrHomeDirectory.toPath().resolve(relative).resolve("core2").resolve(CorePropertiesLocator.PROPERTIES_FILENAME).toFile()); solrHomeDirectory.resolve(relative).resolve("core2").resolve(CorePropertiesLocator.PROPERTIES_FILENAME).toFile());
// one core *not* under the relative directory // one core *not* under the relative directory
addCoreWithProps(makeCorePropFile("core0", false, true, "datadir=core0"), addCoreWithProps(makeCoreProperties("core0", false, true, "datadir=core0"),
solrHomeDirectory.toPath().resolve("core0").resolve(CorePropertiesLocator.PROPERTIES_FILENAME).toFile()); solrHomeDirectory.resolve("core0").resolve(CorePropertiesLocator.PROPERTIES_FILENAME).toFile());
CoreContainer cc = init(); CoreContainer cc = init();
try (SolrCore core1 = cc.getCore("core1"); try (SolrCore core1 = cc.getCore("core1");
@ -323,9 +419,9 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
public void testNoCoreDir() throws Exception { public void testNoCoreDir() throws Exception {
File noCoreDir = createTempDir().toFile(); File noCoreDir = createTempDir().toFile();
setMeUp(noCoreDir.getAbsolutePath()); setMeUp(noCoreDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true), addCoreWithProps(makeCoreProperties("core1", false, true),
new File(noCoreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(noCoreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
addCoreWithProps(makeCorePropFile("core2", false, false), addCoreWithProps(makeCoreProperties("core2", false, false),
new File(noCoreDir, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(noCoreDir, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
CoreContainer cc = init(); CoreContainer cc = init();
try (SolrCore core1 = cc.getCore("core1"); try (SolrCore core1 = cc.getCore("core1");
@ -339,13 +435,13 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
@Test @Test
public void testCoreDirCantRead() throws Exception { public void testCoreDirCantRead() throws Exception {
File coreDir = solrHomeDirectory; File coreDir = solrHomeDirectory.toFile();
setMeUp(coreDir.getAbsolutePath()); setMeUp(coreDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true), addCoreWithProps(makeCoreProperties("core1", false, true),
new File(coreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(coreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
// Insure that another core is opened successfully // Insure that another core is opened successfully
addCoreWithProps(makeCorePropFile("core2", false, false, "dataDir=core2"), addCoreWithProps(makeCoreProperties("core2", false, false, "dataDir=core2"),
new File(coreDir, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(coreDir, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
File toSet = new File(coreDir, "core1"); File toSet = new File(coreDir, "core1");
@ -365,15 +461,15 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
@Test @Test
public void testNonCoreDirCantRead() throws Exception { public void testNonCoreDirCantRead() throws Exception {
File coreDir = solrHomeDirectory; File coreDir = solrHomeDirectory.toFile();
setMeUp(coreDir.getAbsolutePath()); setMeUp(coreDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true), addCoreWithProps(makeCoreProperties("core1", false, true),
new File(coreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(coreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
addCoreWithProps(makeCorePropFile("core2", false, false, "dataDir=core2"), addCoreWithProps(makeCoreProperties("core2", false, false, "dataDir=core2"),
new File(coreDir, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(coreDir, "core2" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
File toSet = new File(solrHomeDirectory, "cantReadDir"); File toSet = new File(solrHomeDirectory.toFile(), "cantReadDir");
assertTrue("Should have been able to make directory '" + toSet.getAbsolutePath() + "' ", toSet.mkdirs()); assertTrue("Should have been able to make directory '" + toSet.getAbsolutePath() + "' ", toSet.mkdirs());
assumeTrue("Cannot make " + toSet + " non-readable. Test aborted.", toSet.setReadable(false, false)); assumeTrue("Cannot make " + toSet + " non-readable. Test aborted.", toSet.setReadable(false, false));
assumeFalse("Appears we are a super user, skip test", toSet.canRead()); assumeFalse("Appears we are a super user, skip test", toSet.canRead());
@ -392,12 +488,12 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
@Test @Test
public void testFileCantRead() throws Exception { public void testFileCantRead() throws Exception {
File coreDir = solrHomeDirectory; File coreDir = solrHomeDirectory.toFile();
setMeUp(coreDir.getAbsolutePath()); setMeUp(coreDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true), addCoreWithProps(makeCoreProperties("core1", false, true),
new File(coreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(coreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
File toSet = new File(solrHomeDirectory, "cantReadFile"); File toSet = new File(solrHomeDirectory.toFile(), "cantReadFile");
assertTrue("Should have been able to make file '" + toSet.getAbsolutePath() + "' ", toSet.createNewFile()); assertTrue("Should have been able to make file '" + toSet.getAbsolutePath() + "' ", toSet.createNewFile());
assumeTrue("Cannot make " + toSet + " non-readable. Test aborted.", toSet.setReadable(false, false)); assumeTrue("Cannot make " + toSet + " non-readable. Test aborted.", toSet.setReadable(false, false));
CoreContainer cc = init(); CoreContainer cc = init();
@ -412,7 +508,7 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
@Test @Test
public void testSolrHomeDoesntExist() throws Exception { public void testSolrHomeDoesntExist() throws Exception {
File homeDir = solrHomeDirectory; File homeDir = solrHomeDirectory.toFile();
IOUtils.rm(homeDir.toPath()); IOUtils.rm(homeDir.toPath());
CoreContainer cc = null; CoreContainer cc = null;
try { try {
@ -430,9 +526,9 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
@Test @Test
public void testSolrHomeNotReadable() throws Exception { public void testSolrHomeNotReadable() throws Exception {
File homeDir = solrHomeDirectory; File homeDir = solrHomeDirectory.toFile();
setMeUp(homeDir.getAbsolutePath()); setMeUp(homeDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true), addCoreWithProps(makeCoreProperties("core1", false, true),
new File(homeDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME)); new File(homeDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
assumeTrue("Cannot make " + homeDir + " non-readable. Test aborted.", homeDir.setReadable(false, false)); assumeTrue("Cannot make " + homeDir + " non-readable. Test aborted.", homeDir.setReadable(false, false));
@ -468,13 +564,13 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
@Test @Test
public void testRootDirectoryResolution() { public void testRootDirectoryResolution() {
SolrResourceLoader loader = new SolrResourceLoader(solrHomeDirectory.toPath()); SolrResourceLoader loader = new SolrResourceLoader(solrHomeDirectory);
NodeConfig config = SolrXmlConfig.fromString(loader, "<solr><str name=\"coreRootDirectory\">relative</str></solr>"); NodeConfig config = SolrXmlConfig.fromString(loader, "<solr><str name=\"coreRootDirectory\">relative</str></solr>");
assertThat(config.getCoreRootDirectory().toString(), containsString(solrHomeDirectory.getAbsolutePath())); assertThat(config.getCoreRootDirectory().toString(), containsString(solrHomeDirectory.toAbsolutePath().toString()));
NodeConfig absConfig = SolrXmlConfig.fromString(loader, "<solr><str name=\"coreRootDirectory\">/absolute</str></solr>"); NodeConfig absConfig = SolrXmlConfig.fromString(loader, "<solr><str name=\"coreRootDirectory\">/absolute</str></solr>");
assertThat(absConfig.getCoreRootDirectory().toString(), not(containsString(solrHomeDirectory.getAbsolutePath()))); assertThat(absConfig.getCoreRootDirectory().toString(), not(containsString(solrHomeDirectory.toAbsolutePath().toString())));
} }
} }