You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2017/06/11 19:59:08 UTC
lucene-solr:branch_6_6: SOLR-10857: Solr loads UNLOADed core on
request.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_6 e3a85df80 -> bc4704244
SOLR-10857: Solr loads UNLOADed core on request.
(cherry picked from commit 95841d9ed406def6be62ab039dba8c4dd4b552a8)
(cherry picked from commit 3ecd679)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bc470424
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bc470424
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bc470424
Branch: refs/heads/branch_6_6
Commit: bc470424464f399043c516dd250ba56ca2b78da7
Parents: e3a85df
Author: Erick <er...@apache.org>
Authored: Sun Jun 11 12:54:48 2017 -0700
Committer: Erick <er...@apache.org>
Committed: Sun Jun 11 12:56:33 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 7 +++
.../org/apache/solr/core/CoreContainer.java | 23 +++++----
.../handler/admin/CoreAdminHandlerTest.java | 52 ++++++++++++++++++++
3 files changed, 70 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bc470424/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a469dc9..7b0e5c6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -33,6 +33,13 @@ Jetty 9.3.14.v20161028
(No Changes)
+================== 6.6.1 ==================
+
+Bug Fixes
+----------------------
+
+* SOLR-10857: standalone Solr loads UNLOADed core on request (Erick Erickson, Mikhail Khludnev)
+
================== 6.6.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bc470424/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 11621f9..507c4d6 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -144,7 +144,7 @@ public class CoreContainer {
private UpdateShardHandler updateShardHandler;
private TransientSolrCoreCacheFactory transientCoreCache;
-
+
private ExecutorService coreContainerWorkExecutor = ExecutorUtil.newMDCAwareCachedThreadPool(
new DefaultSolrThreadFactory("coreContainerWorkExecutor") );
@@ -613,7 +613,7 @@ public class CoreContainer {
}
return transientCoreCache.getTransientSolrCoreCache();
}
-
+
public void securityNodeChanged() {
log.info("Security node changed, reloading security.json");
reloadSecurityProperties();
@@ -779,7 +779,7 @@ public class CoreContainer {
if( core == null ) {
throw new RuntimeException( "Can not register a null core." );
}
-
+
if (isShutDown) {
core.close();
throw new IllegalStateException("This CoreContainer has been closed");
@@ -1061,7 +1061,7 @@ public class CoreContainer {
/**
* get a list of all the cores that are currently loaded
* @return a list of al lthe available core names in either permanent or transient core lists.
- *
+ *
* Note: this implies that the core is loaded
*/
public Collection<String> getAllCoreNames() {
@@ -1110,12 +1110,12 @@ public class CoreContainer {
if (ret == null) {
oldDesc.loadExtraProperties(); // there may be changes to extra properties that we need to pick up.
return oldDesc;
-
+
}
// The CloudDescriptor bit here is created in a very convoluted way, requiring access to private methods
// in ZkController. When reloading, this behavior is identical to what used to happen where a copy of the old
// CoreDescriptor was just re-used.
-
+
if (ret.getCloudDescriptor() != null) {
ret.getCloudDescriptor().reload(oldDesc.getCloudDescriptor());
}
@@ -1133,7 +1133,7 @@ public class CoreContainer {
public void reload(String name) {
SolrCore core = solrCores.getCoreFromAnyList(name, false);
if (core != null) {
-
+
// The underlying core properties files may have changed, we don't really know. So we have a (perhaps) stale
// CoreDescriptor and we need to reload it from the disk files
CoreDescriptor cd = reloadCoreDescriptor(core.getCoreDescriptor());
@@ -1214,6 +1214,8 @@ public class CoreContainer {
boolean close = solrCores.isLoadedNotPendingClose(name);
SolrCore core = solrCores.remove(name);
+
+ solrCores.removeCoreDescriptor(cd);
coresLocator.delete(this, cd);
if (core == null) {
// transient core
@@ -1243,9 +1245,6 @@ public class CoreContainer {
throw new SolrException(ErrorCode.SERVER_ERROR, "Error unregistering core [" + name + "] from cloud state", e);
}
}
- if (deleteInstanceDir) { // we aren't going to reload this if we delete the instance dir.
- solrCores.removeCoreDescriptor(cd);
- }
}
public void rename(String name, String toName) {
@@ -1315,10 +1314,10 @@ public class CoreContainer {
// This is a bit of awkwardness where SolrCloud and transient cores don't play nice together. For transient cores,
// we have to allow them to be created at any time there hasn't been a core load failure (use reload to cure that).
// But for TestConfigSetsAPI.testUploadWithScriptUpdateProcessor, this needs to _not_ try to load the core if
- // the core is null and there was an error. If you change this, be sure to run both TestConfiSetsAPI and
+ // the core is null and there was an error. If you change this, be sure to run both TestConfiSetsAPI and
// TestLazyCores
if (desc == null || zkSys.getZkController() != null) return null;
-
+
// This will put an entry in pending core ops if the core isn't loaded
core = solrCores.waitAddPendingCoreOps(name);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bc470424/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 a81cf13..f1770f8 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
@@ -27,10 +27,12 @@ import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.Constants;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.SolrQuery;
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.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CoreAdminParams;
@@ -283,6 +285,56 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
}
@Test
+ public void testUnloadForever() 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();
+ }
+
+ try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl() + "/corex")) {
+ client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ QueryResponse result = client.query(new SolrQuery("id:*"));
+ assertEquals(1,result.getResults().getNumFound());
+ }
+
+ try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {
+ client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ CoreAdminRequest.Unload req = new CoreAdminRequest.Unload(false);
+ req.setDeleteInstanceDir(false);//random().nextBoolean());
+ req.setCoreName("corex");
+ req.process(client);
+ }
+
+ try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl() + "/corex")) {
+ client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
+ client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT*1000);
+ QueryResponse result = client.query(new SolrQuery("id:*"));
+ //assertEquals(1,result.getResults().getNumFound());
+ fail("expect 404");
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+ finally{
+ runner.stop();
+ }
+ }
+
+ @Test
public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
assumeFalse("Ignore test on windows because it does not delete data directory immediately after unload", Constants.WINDOWS);
File solrHomeDirectory = new File(initCoreDataDir, getClass().getName() + "-corex-"