magibney commented on code in PR #1302:
URL: https://github.com/apache/solr/pull/1302#discussion_r1081618038
##########
solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java:
##########
@@ -198,88 +198,94 @@ public ManagedIndexSchema create(
this.loader = config.getResourceLoader();
InputStream schemaInputStream = null;
- if (null == resourceName) {
- resourceName = IndexSchema.DEFAULT_SCHEMA_FILE;
- }
-
- int schemaZkVersion = -1;
- if (!(loader instanceof ZkSolrResourceLoader)) {
- schemaInputStream = readSchemaLocally();
- } else { // ZooKeeper
- final ZkSolrResourceLoader zkLoader = (ZkSolrResourceLoader) loader;
- final SolrZkClient zkClient = zkLoader.getZkController().getZkClient();
- final String managedSchemaPath = lookupZKManagedSchemaPath();
- managedSchemaResourceName =
- managedSchemaPath.substring(managedSchemaPath.lastIndexOf("/") + 1);
// not loving this
- Stat stat = new Stat();
- try {
- // Attempt to load the managed schema
- byte[] data = zkClient.getData(managedSchemaPath, null, stat, true);
- schemaZkVersion = stat.getVersion();
- schemaInputStream =
- new ZkSolrResourceLoader.ZkByteArrayInputStream(data,
managedSchemaPath, stat);
- loadedResource = managedSchemaResourceName;
- warnIfNonManagedSchemaExists();
- } catch (InterruptedException e) {
- // Restore the interrupted status
- Thread.currentThread().interrupt();
- log.warn("", e);
- } catch (KeeperException.NoNodeException e) {
- log.info(
- "The schema is configured as managed, but managed schema resource
{} not found - loading non-managed schema {} instead",
- managedSchemaResourceName,
- resourceName);
- } catch (KeeperException e) {
- String msg = "Error attempting to access " + managedSchemaPath;
- log.error(msg, e);
- throw new SolrException(ErrorCode.SERVER_ERROR, msg, e);
+ try {
+ if (null == resourceName) {
+ resourceName = IndexSchema.DEFAULT_SCHEMA_FILE;
}
- if (null == schemaInputStream) {
- // The managed schema file could not be found - load the non-managed
schema
+
+ int schemaZkVersion = -1;
+ if (!(loader instanceof ZkSolrResourceLoader)) {
+ schemaInputStream = readSchemaLocally();
+ } else { // ZooKeeper
+ final ZkSolrResourceLoader zkLoader = (ZkSolrResourceLoader) loader;
+ final SolrZkClient zkClient = zkLoader.getZkController().getZkClient();
+ final String managedSchemaPath = lookupZKManagedSchemaPath();
+ managedSchemaResourceName =
+ managedSchemaPath.substring(managedSchemaPath.lastIndexOf("/") +
1); // not loving this
+ Stat stat = new Stat();
try {
- schemaInputStream = loader.openResource(resourceName);
- loadedResource = resourceName;
- shouldUpgrade = true;
- } catch (IOException e) {
+ // Attempt to load the managed schema
+ byte[] data = zkClient.getData(managedSchemaPath, null, stat, true);
+ schemaZkVersion = stat.getVersion();
+ schemaInputStream =
+ new ZkSolrResourceLoader.ZkByteArrayInputStream(data,
managedSchemaPath, stat);
+ loadedResource = managedSchemaResourceName;
+ warnIfNonManagedSchemaExists();
+ } catch (InterruptedException e) {
+ // Restore the interrupted status
+ Thread.currentThread().interrupt();
+ log.warn("", e);
+ } catch (KeeperException.NoNodeException e) {
+ log.info(
+ "The schema is configured as managed, but managed schema
resource {} not found - loading non-managed schema {} instead",
+ managedSchemaResourceName,
+ resourceName);
+ } catch (KeeperException e) {
+ String msg = "Error attempting to access " + managedSchemaPath;
+ log.error(msg, e);
+ throw new SolrException(ErrorCode.SERVER_ERROR, msg, e);
+ }
+ if (null == schemaInputStream) {
+ // The managed schema file could not be found - load the non-managed
schema
try {
- // Retry to load the managed schema, in case it was created since
the first attempt
- byte[] data = zkClient.getData(managedSchemaPath, null, stat,
true);
- schemaZkVersion = stat.getVersion();
- schemaInputStream = new ByteArrayInputStream(data);
- loadedResource = managedSchemaPath;
- warnIfNonManagedSchemaExists();
- } catch (Exception e1) {
- if (e1 instanceof InterruptedException) {
- Thread.currentThread().interrupt(); // Restore the interrupted
status
+ schemaInputStream = loader.openResource(resourceName);
+ loadedResource = resourceName;
+ shouldUpgrade = true;
+ } catch (IOException e) {
+ try {
+ // Retry to load the managed schema, in case it was created
since the first attempt
+ byte[] data = zkClient.getData(managedSchemaPath, null, stat,
true);
+ schemaZkVersion = stat.getVersion();
+ schemaInputStream = new ByteArrayInputStream(data);
+ loadedResource = managedSchemaPath;
+ warnIfNonManagedSchemaExists();
+ } catch (Exception e1) {
+ if (e1 instanceof InterruptedException) {
+ Thread.currentThread().interrupt(); // Restore the interrupted
status
+ }
+ final String msg =
+ "Error loading both non-managed schema '"
+ + resourceName
+ + "' and managed schema '"
+ + managedSchemaResourceName
+ + "'";
+ log.error(msg, e);
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
msg, e);
}
- final String msg =
- "Error loading both non-managed schema '"
- + resourceName
- + "' and managed schema '"
- + managedSchemaResourceName
- + "'";
- log.error(msg, e);
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, msg,
e);
}
}
}
+ InputSource inputSource = new InputSource(schemaInputStream);
+
inputSource.setSystemId(SystemIdResolver.createSystemIdFromResourceName(loadedResource));
Review Comment:
Thanks for the reassurance and extra explanation!
3a047d404b4e994865711229329a7461a751897b should fix this. Whether or not
this class needs to be thread-safe, it seems weird to me that `loadedResource`
is an instance variable -- seems mostly to exist in order to pass extra info
from the `readSchemaLocally()` method back to the `create()` method, which
could be straightforwardly done another way. I'm happy to include
3a047d404b4e994865711229329a7461a751897b in this PR or revert it from the PR
branch, depending on what you prefer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
