Uploaded image for project: 'Solr'
  1. Solr
  2. SOLR-9277

Clean up some more remnants of supporting old and new style solr.xml in tests

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 6.2, master (7.0)
    • Component/s: None
    • Security Level: Public (Default Security Level. Issues are Public)
    • Labels:
      None

      Description

      I have reason to look at the tests and I'm seeing a few remnants of old/new style Solr.xml support (with and without <cores>). So far:
      > SolrTestCaseJ4.copySolrHomeToTemp with a flag whether old or new style.
      > solr-no-core.xml in test files. Mostly this is identical to solr.xml, here are the differences:

      in solr-no-core.xml but not solr.xml
      <int name="autoReplicaFailoverWaitAfterExpiration">$

      {autoReplicaFailoverWaitAfterExpiration:10000}

      </int>
      <int name="autoReplicaFailoverWorkLoopDelay">$

      {autoReplicaFailoverWorkLoopDelay:10000}

      </int>
      <int name="autoReplicaFailoverBadNodeExpiration">$

      {autoReplicaFailoverBadNodeExpiration:60000}

      </int>

      in solr.xml but not in solr-no-cores.xml:
      <int name="leaderVoteWait">$

      {leaderVoteWait:10000}

      </int>

      The question here is whether moving the three properties in solr-no-cores.xml to solr.xml and using solr.xml in all the tests that currently use solr-no-cores.xml would mess up tests and whether leaderVoteWait being in solr.xml would mess up tests currently using solr-no-cores.xml.

      I'll make a quick hack at this to see and we can discuss.

      1. beast-9277
        0.2 kB
        Erick Erickson

        Activity

        Hide
        erickerickson Erick Erickson added a comment - - edited

        Noble Paul Ishan Chattopadhyaya Mark Miller Mostly throwing this out for discussion, any off-the-top-of-your-head comments? Perhaps make the vars like autoReplicaFailoverBadNodeExpiration into some kind of default and set sys props as necessary?

        NOTE: I really haven't dug into this at all (doing so now). This is mostly a marker.

        Show
        erickerickson Erick Erickson added a comment - - edited Noble Paul Ishan Chattopadhyaya Mark Miller Mostly throwing this out for discussion, any off-the-top-of-your-head comments? Perhaps make the vars like autoReplicaFailoverBadNodeExpiration into some kind of default and set sys props as necessary? NOTE: I really haven't dug into this at all (doing so now). This is mostly a marker.
        Hide
        markrmiller@gmail.com Mark Miller added a comment -

        It should be fine to keep them all. 3 are related to autoAddReplica and will have no effect. One is related to recovery. We might want to set that one to the real default (minutes) and let certain tests lower it, but either way, it should be fine.

        Show
        markrmiller@gmail.com Mark Miller added a comment - It should be fine to keep them all. 3 are related to autoAddReplica and will have no effect. One is related to recovery. We might want to set that one to the real default (minutes) and let certain tests lower it, but either way, it should be fine.
        Hide
        erickerickson Erick Erickson added a comment -

        Patch with CHANGES.txt entry

        Show
        erickerickson Erick Erickson added a comment - Patch with CHANGES.txt entry
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit 7743718d2982c7360911dddb2b4723cb52b58925 in lucene-solr's branch refs/heads/master from Erick
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=7743718 ]

        SOLR-9277: Clean up some more remnants of supporting old and new style solr.xml in tests

        Show
        jira-bot ASF subversion and git services added a comment - Commit 7743718d2982c7360911dddb2b4723cb52b58925 in lucene-solr's branch refs/heads/master from Erick [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=7743718 ] SOLR-9277 : Clean up some more remnants of supporting old and new style solr.xml in tests
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit 602a72ddade76931b90d59bd03365666c2835223 in lucene-solr's branch refs/heads/branch_6x from Erick
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=602a72d ]

        SOLR-9277: Clean up some more remnants of supporting old and new style solr.xml in tests
        (cherry picked from commit 7743718)

        Show
        jira-bot ASF subversion and git services added a comment - Commit 602a72ddade76931b90d59bd03365666c2835223 in lucene-solr's branch refs/heads/branch_6x from Erick [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=602a72d ] SOLR-9277 : Clean up some more remnants of supporting old and new style solr.xml in tests (cherry picked from commit 7743718)
        Hide
        mikemccand Michael McCandless added a comment -

        Bulk close resolved issues after 6.2.0 release.

        Show
        mikemccand Michael McCandless added a comment - Bulk close resolved issues after 6.2.0 release.

          People

          • Assignee:
            erickerickson Erick Erickson
            Reporter:
            erickerickson Erick Erickson
          • Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development