You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@lucene.apache.org by GitBox <gi...@apache.org> on 2020/02/27 20:10:42 UTC

[GitHub] [lucene-solr] madrob opened a new pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary

madrob opened a new pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary
URL: https://github.com/apache/lucene-solr/pull/1298
 
 
   

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org


[GitHub] [lucene-solr] madrob commented on issue #1298: SOLR-14289 Skip ZkChroot check when not necessary

Posted by GitBox <gi...@apache.org>.
madrob commented on issue #1298: SOLR-14289 Skip ZkChroot check when not necessary
URL: https://github.com/apache/lucene-solr/pull/1298#issuecomment-598756692
 
 
   Switched to a boolean, and rebased to account for SOLR-14197 changes

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org


[GitHub] [lucene-solr] madrob commented on a change in pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary

Posted by GitBox <gi...@apache.org>.
madrob commented on a change in pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary
URL: https://github.com/apache/lucene-solr/pull/1298#discussion_r391898475
 
 

 ##########
 File path: solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
 ##########
 @@ -285,7 +285,7 @@ public static NodeConfig loadNodeConfig(Path solrHome, Properties nodeProperties
           if (zkClient.exists("/solr.xml", true)) {
             log.info("solr.xml found in ZooKeeper. Loading...");
             byte[] data = zkClient.getData("/solr.xml", null, null, true);
-            return SolrXmlConfig.fromInputStream(loader, new ByteArrayInputStream(data));
+            return SolrXmlConfig.fromInputStream(loader, new ByteArrayInputStream(data), "zookeeper");
 
 Review comment:
   Yea, a boolean would be sufficient. I was thinking about if we need to have other sources in the future, but we can change this to a string/enum later.

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org


[GitHub] [lucene-solr] dsmiley commented on a change in pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary

Posted by GitBox <gi...@apache.org>.
dsmiley commented on a change in pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary
URL: https://github.com/apache/lucene-solr/pull/1298#discussion_r389891175
 
 

 ##########
 File path: solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
 ##########
 @@ -285,7 +285,7 @@ public static NodeConfig loadNodeConfig(Path solrHome, Properties nodeProperties
           if (zkClient.exists("/solr.xml", true)) {
             log.info("solr.xml found in ZooKeeper. Loading...");
             byte[] data = zkClient.getData("/solr.xml", null, null, true);
-            return SolrXmlConfig.fromInputStream(loader, new ByteArrayInputStream(data));
+            return SolrXmlConfig.fromInputStream(loader, new ByteArrayInputStream(data), "zookeeper");
 
 Review comment:
   So, what other than "zookeeper" is used here?  Do we just need a boolean if this is the only value?

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org


[GitHub] [lucene-solr] dsmiley commented on a change in pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary

Posted by GitBox <gi...@apache.org>.
dsmiley commented on a change in pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary
URL: https://github.com/apache/lucene-solr/pull/1298#discussion_r391985435
 
 

 ##########
 File path: solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
 ##########
 @@ -285,7 +285,7 @@ public static NodeConfig loadNodeConfig(Path solrHome, Properties nodeProperties
           if (zkClient.exists("/solr.xml", true)) {
             log.info("solr.xml found in ZooKeeper. Loading...");
             byte[] data = zkClient.getData("/solr.xml", null, null, true);
-            return SolrXmlConfig.fromInputStream(loader, new ByteArrayInputStream(data));
+            return SolrXmlConfig.fromInputStream(loader, new ByteArrayInputStream(data), "zookeeper");
 
 Review comment:
   Then I much prefer a boolean as it'd be much clearer -- "isInZooKeeper" or some-such.

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org


[GitHub] [lucene-solr] madrob merged pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary

Posted by GitBox <gi...@apache.org>.
madrob merged pull request #1298: SOLR-14289 Skip ZkChroot check when not necessary
URL: https://github.com/apache/lucene-solr/pull/1298
 
 
   

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org