NazerkeBS commented on a change in pull request #322:
URL: https://github.com/apache/solr/pull/322#discussion_r724035366
##########
File path: solr/core/src/java/org/apache/solr/core/ConfigSetService.java
##########
@@ -78,28 +80,30 @@ private static ConfigSetService instantiate(CoreContainer
coreContainer) {
}
}
- public void bootstrapConfigSet() {
+ private void bootstrapConfigSet(CoreContainer coreContainer) {
// bootstrap _default conf, bootstrap_confdir and bootstrap_conf if
provided via system property
- String confDir = System.getProperty("bootstrap_confdir");
- boolean boostrapConf = Boolean.getBoolean("bootstrap_conf");
try {
// _default conf
bootstrapDefaultConf();
+
// bootstrap_confdir
+ String confDir = System.getProperty("bootstrap_confdir");
if (confDir != null) {
bootstrapConfDir(confDir);
}
+
// bootstrap_conf, in SolrCloud mode
+ boolean boostrapConf = Boolean.getBoolean("bootstrap_conf");
if (boostrapConf == true) {
- if (this instanceof ZkConfigSetService) {
- bootstrapConf(((ZkConfigSetService)
this).getZkController().getCoreContainer());
+ if (coreContainer.getZkController() != null) {
Review comment:
another concern: ZkCli.main() uses ConfigSetService.bootstrapConf();
although it is ZkConfigSetService, zkController is null. I tempted to do
assertion `assert coreContainer.getZkContainer != null` in
ConfigSetService.bootstrapConf(), but then I saw zkController is not
instantiated in ZkCli. Maybe it is an edge case ?
--
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
