You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/11/01 09:04:08 UTC
lucene-solr:branch_6x: SOLR-9433: SolrCore clean-up logic uses
incorrect path to delete dataDir on failure to create a core
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 2175f6fde -> da7ccd3ee
SOLR-9433: SolrCore clean-up logic uses incorrect path to delete dataDir on failure to create a core
(cherry picked from commit 5120816)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/da7ccd3e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/da7ccd3e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/da7ccd3e
Branch: refs/heads/branch_6x
Commit: da7ccd3eefc92943ac0cea5103c84530f77d67a4
Parents: 2175f6f
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Tue Nov 1 14:32:46 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Nov 1 14:34:07 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++
.../src/java/org/apache/solr/core/SolrCore.java | 2 +-
.../handler/admin/CoreAdminHandlerTest.java | 55 ++++++++++++++++++++
3 files changed, 59 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da7ccd3e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f9660fe..bd14d0b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -52,6 +52,9 @@ Bug Fixes
* SOLR-9701: NPE in export handler when "fl" parameter is omitted.
(Erick Erickson)
+* SOLR-9433: SolrCore clean-up logic uses incorrect path to delete dataDir on failure to create a core.
+ (Evan Sayer, shalin)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da7ccd3e/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
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 061e554..1148b45 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2613,7 +2613,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
public static void deleteUnloadedCore(CoreDescriptor cd, boolean deleteDataDir, boolean deleteInstanceDir) {
if (deleteDataDir) {
- File dataDir = new File(cd.getDataDir());
+ File dataDir = new File(cd.getInstanceDir().resolve(cd.getDataDir()).toAbsolutePath().toString());
try {
FileUtils.deleteDirectory(dataDir);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da7ccd3e/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
index 04bc3bd..8d2156d 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Map;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
@@ -28,6 +29,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
+import org.apache.solr.client.solrj.request.CoreStatus;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CoreAdminParams;
@@ -280,6 +282,59 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
}
@Test
+ public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
+ File solrHomeDirectory = new File(initCoreDataDir, getClass().getName() + "-corex-"
+ + System.nanoTime());
+ solrHomeDirectory.mkdirs();
+ copySolrHomeToTemp(solrHomeDirectory, "corex");
+ File corex = new File(solrHomeDirectory, "corex");
+ FileUtils.write(new File(corex, "core.properties"), "", StandardCharsets.UTF_8);
+ JettySolrRunner runner = new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), buildJettyConfig("/solr"));
+ runner.start();
+
+ try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl() + "/corex")) {
+ client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ SolrInputDocument doc = new SolrInputDocument();
+ doc.addField("id", "123");
+ client.add(doc);
+ client.commit();
+ }
+
+ Path dataDir = null;
+ try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {
+ CoreStatus status = CoreAdminRequest.getCoreStatus("corex", true, client);
+ String dataDirectory = status.getDataDirectory();
+ dataDir = Paths.get(dataDirectory);
+ assertTrue(Files.exists(dataDir));
+ }
+
+ File subHome = new File(solrHomeDirectory, "corex" + File.separator + "conf");
+ String top = SolrTestCaseJ4.TEST_HOME() + "/collection1/conf";
+ FileUtils.copyFile(new File(top, "bad-error-solrconfig.xml"), new File(subHome, "solrconfig.xml"));
+
+ try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {
+ client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ try {
+ CoreAdminRequest.reloadCore("corex", client);
+ } catch (Exception e) {
+ // this is expected because we put a bad solrconfig -- ignore
+ }
+
+ CoreAdminRequest.Unload req = new CoreAdminRequest.Unload(false);
+ req.setDeleteDataDir(true);
+ req.setDeleteInstanceDir(false); // important because the data directory is inside the instance directory
+ req.setCoreName("corex");
+ req.process(client);
+ }
+
+ runner.stop();
+
+ assertTrue("The data directory was not cleaned up on unload after a failed core reload", Files.notExists(dataDir));
+ }
+
+ @Test
public void testNonexistentCoreReload() throws Exception {
final CoreAdminHandler admin = new CoreAdminHandler(h.getCoreContainer());
SolrQueryResponse resp = new SolrQueryResponse();