SOLR-14211: Fix a bug introduced in SOLR-14192.

This commit is contained in:
Andrzej Bialecki 2020-01-23 19:33:12 +01:00
parent 7316391d2d
commit df91041652

View File

@ -422,11 +422,12 @@ public class SchemaManager {
SolrResourceLoader resourceLoader = core.getResourceLoader(); SolrResourceLoader resourceLoader = core.getResourceLoader();
String name = core.getLatestSchema().getResourceName(); String name = core.getLatestSchema().getResourceName();
if (resourceLoader instanceof ZkSolrResourceLoader) { if (resourceLoader instanceof ZkSolrResourceLoader) {
SolrZkClient zkClient = ((ZkSolrResourceLoader) resourceLoader).getZkController().getZkClient(); final ZkSolrResourceLoader zkLoader = (ZkSolrResourceLoader)resourceLoader;
SolrZkClient zkClient = zkLoader.getZkController().getZkClient();
try { try {
if (!zkClient.exists(name, true)) { if (!zkClient.exists(zkLoader.getConfigSetZkPath() + "/" + name, true)) {
String backupName = name + ManagedIndexSchemaFactory.UPGRADED_SCHEMA_EXTENSION; String backupName = name + ManagedIndexSchemaFactory.UPGRADED_SCHEMA_EXTENSION;
if (!zkClient.exists(backupName, true)) { if (!zkClient.exists(zkLoader.getConfigSetZkPath() + "/" + backupName, true)) {
log.warn("Unable to retrieve fresh managed schema, neither " + name + " nor " + backupName + " exist."); log.warn("Unable to retrieve fresh managed schema, neither " + name + " nor " + backupName + " exist.");
// use current schema // use current schema
return (ManagedIndexSchema) core.getLatestSchema(); return (ManagedIndexSchema) core.getLatestSchema();