Solr
  1. Solr
  2. SOLR-7735

Look for solr.xml in Zookeeper by default

    Details

    • Type: Improvement Improvement
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 5.2.1
    • Fix Version/s: 5.3, 6.0
    • Component/s: SolrCloud
    • Labels:
      None

      Description

      In SOLR-4718 support was added for reading solr.xml from ZK by providing system property solr.solrxml.location=zookeeper. If this property is not specified, solr.xml is read from SOLR_HOME. This issue is a spinoff from SOLR-7727 where start scripts do not support solr.xml in ZK.

      Instead of adding this to start scripts, suggest to simplify the whole logic:

      • If not in cloud mode, require solr.xml in SOLR_HOME as today
      • If in cloud mode, first look for solr.xml in ZK, but if not found, load from SOLR_HOME as today
      • Remove the need for solr.solrxml.location property
      1. SOLR-7735.patch
        15 kB
        Jan Høydahl
      2. SOLR-7735.patch
        10 kB
        Jan Høydahl

        Issue Links

          Activity

          Hide
          Jan Høydahl added a comment -

          Attaching patch. Tests and precommit SUCCESS. All mention of solr.solrxml.location is gone, added a WARN log if someone tries to use it.

          The sysprop is not documented in the refguide as of now, but still I mentioned the change in the "Upgrading from Solr 5.2" section of CHANGES.

          Last chance for veto before committing in a few days.

          Show
          Jan Høydahl added a comment - Attaching patch. Tests and precommit SUCCESS. All mention of solr.solrxml.location is gone, added a WARN log if someone tries to use it. The sysprop is not documented in the refguide as of now, but still I mentioned the change in the "Upgrading from Solr 5.2" section of CHANGES. Last chance for veto before committing in a few days.
          Hide
          Jan Høydahl added a comment -

          New patch. More concise code. Better error messages. Updated start scripts so they only abort at missing SOLR_HOME/solr.xml in non-cloud mode.

          Tested various code paths manually. Tested start script for Unix and Windows. Please give it a spin and report back.

          Show
          Jan Høydahl added a comment - New patch. More concise code. Better error messages. Updated start scripts so they only abort at missing SOLR_HOME/solr.xml in non-cloud mode. Tested various code paths manually. Tested start script for Unix and Windows. Please give it a spin and report back.
          Hide
          ASF subversion and git services added a comment -

          Commit 1692673 from janhoy@apache.org in branch 'dev/trunk'
          [ https://svn.apache.org/r1692673 ]

          SOLR-7735: Look for solr.xml in Zookeeper by default

          Show
          ASF subversion and git services added a comment - Commit 1692673 from janhoy@apache.org in branch 'dev/trunk' [ https://svn.apache.org/r1692673 ] SOLR-7735 : Look for solr.xml in Zookeeper by default
          Hide
          Jan Høydahl added a comment -

          Committed to trunk, will wait a few days before backporting to 5.x and resolving this issue.

          Show
          Jan Høydahl added a comment - Committed to trunk, will wait a few days before backporting to 5.x and resolving this issue.
          Hide
          ASF subversion and git services added a comment -

          Commit 1693817 from janhoy@apache.org in branch 'dev/branches/branch_5x'
          [ https://svn.apache.org/r1693817 ]

          SOLR-7735: Look for solr.xml in Zookeeper by default in SolrCloud mode (backport)

          Show
          ASF subversion and git services added a comment - Commit 1693817 from janhoy@apache.org in branch 'dev/branches/branch_5x' [ https://svn.apache.org/r1693817 ] SOLR-7735 : Look for solr.xml in Zookeeper by default in SolrCloud mode (backport)
          Hide
          Jan Høydahl added a comment -

          Fixed. Opening other issue for documentation

          Show
          Jan Høydahl added a comment - Fixed. Opening other issue for documentation
          Hide
          Shalin Shekhar Mangar added a comment -

          Bulk close for 5.3.0 release

          Show
          Shalin Shekhar Mangar added a comment - Bulk close for 5.3.0 release

            People

            • Assignee:
              Jan Høydahl
              Reporter:
              Jan Høydahl
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development