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

SOLR-14151: cleanup

This commit is contained in:
noble 2020-09-29 15:37:47 +10:00
parent 01da67c728
commit a65e9dd311
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/core/ConfigSet.java
View File

@ -30,7 +30,7 @@ public class ConfigSet {
private final String name; private final String name;
private final SolrConfig solrconfig; private final SolrConfig solrconfig;
private IndexSchema schema; private volatile IndexSchema schema;
private final SchemaSupplier schemaSupplier; private final SchemaSupplier schemaSupplier;

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

@ -1589,13 +1589,7 @@ public class CoreContainer {
public void reload(String name) { public void reload(String name) {
reload(name, null); reload(name, null);
} }
public void reload(String name, UUID coreId, boolean async) {
if(async) {
runAsync(() -> reload(name, coreId));
} else {
reload(name, coreId);
}
}
/** /**
* Recreates a SolrCore. * Recreates a SolrCore.
* While the new core is loading, requests will continue to be dispatched to * While the new core is loading, requests will continue to be dispatched to

4
solr/core/src/java/org/apache/solr/core/SolrCore.java
View File

@ -64,7 +64,6 @@ import com.codahale.metrics.Timer;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import com.google.common.collect.MapMaker; import com.google.common.collect.MapMaker;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.Codec;
import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexDeletionPolicy; import org.apache.lucene.index.IndexDeletionPolicy;
@ -76,6 +75,7 @@ import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.ResourceLoader;
import org.apache.solr.client.solrj.impl.BinaryResponseParser; import org.apache.solr.client.solrj.impl.BinaryResponseParser;
import org.apache.solr.cloud.CloudDescriptor; import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.cloud.RecoveryStrategy; import org.apache.solr.cloud.RecoveryStrategy;
@ -3107,7 +3107,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
if (configHandler.getReloadLock().tryLock()) { if (configHandler.getReloadLock().tryLock()) {
try { try {
cc.reload(coreName, coreId, false); cc.reload(coreName, coreId);
} catch (SolrCoreState.CoreIsClosedException e) { } catch (SolrCoreState.CoreIsClosedException e) {
/*no problem this core is already closed*/ /*no problem this core is already closed*/
} finally { } finally {

2
solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
View File

@ -547,7 +547,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
latestVersion, 30); latestVersion, 30);
} else { } else {
SolrResourceLoader.persistConfLocally(loader, ConfigOverlay.RESOURCE_NAME, overlay.toByteArray()); SolrResourceLoader.persistConfLocally(loader, ConfigOverlay.RESOURCE_NAME, overlay.toByteArray());
req.getCore().getCoreContainer().reload(req.getCore().getName(), req.getCore().uniqueId, false); req.getCore().getCoreContainer().reload(req.getCore().getName(), req.getCore().uniqueId);
log.info("Executed config commands successfully and persisted to File System {}", ops); log.info("Executed config commands successfully and persisted to File System {}", ops);
} }

4
solr/core/src/java/org/apache/solr/schema/SchemaManager.java
View File

@ -132,7 +132,7 @@ public class SchemaManager {
latestVersion = ZkController.persistConfigResourceToZooKeeper latestVersion = ZkController.persistConfigResourceToZooKeeper
(zkLoader, managedIndexSchema.getSchemaZkVersion(), managedIndexSchema.getResourceName(), (zkLoader, managedIndexSchema.getSchemaZkVersion(), managedIndexSchema.getResourceName(),
sw.toString().getBytes(StandardCharsets.UTF_8), true); sw.toString().getBytes(StandardCharsets.UTF_8), true);
req.getCore().getCoreContainer().reload(req.getCore().getName(), req.getCore().uniqueId, false); req.getCore().getCoreContainer().reload(req.getCore().getName(), req.getCore().uniqueId);
break; break;
} catch (ZkController.ResourceModifiedInZkException e) { } catch (ZkController.ResourceModifiedInZkException e) {
log.info("Schema was modified by another node. Retrying.."); log.info("Schema was modified by another node. Retrying..");
@ -142,7 +142,7 @@ public class SchemaManager {
//only for non cloud stuff //only for non cloud stuff
managedIndexSchema.persistManagedSchema(false); managedIndexSchema.persistManagedSchema(false);
core.setLatestSchema(managedIndexSchema); core.setLatestSchema(managedIndexSchema);
core.getCoreContainer().reload(core.getName(), core.uniqueId, false); core.getCoreContainer().reload(core.getName(), core.uniqueId);
} catch (SolrException e) { } catch (SolrException e) {
log.warn(errorMsg); log.warn(errorMsg);
errors = singletonList(errorMsg + e.getMessage()); errors = singletonList(errorMsg + e.getMessage());