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

Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references

    Details

    • Type: Improvement
    • Status: Resolved
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 6.6.1, 6.7, 7.0
    • Component/s: None
    • Security Level: Public (Default Security Level. Issues are Public)
    • Labels:
      None

      Description

      There are a few bits of the code from SOLR-10007, SOLR-8906 that could stand some cleanup. For instance, the TransientSolrCoreCache is rather awkwardly hanging around in CoreContainer and would fit more naturally in SolrCores.

      What I've seen so far shouldn't result in incorrect behavior, just cleaning up for the future.

      1. SOLR-10910.patch
        35 kB
        Erick Erickson
      2. SOLR-10910.patch
        19 kB
        Erick Erickson

        Activity

        Hide
        erickerickson Erick Erickson added a comment -

        Here's what this patch is looking like. Precommit and all tests pass, will commit in a day or two unless there are objections.

        Show
        erickerickson Erick Erickson added a comment - Here's what this patch is looking like. Precommit and all tests pass, will commit in a day or two unless there are objections.
        Hide
        erickerickson Erick Erickson added a comment -

        Final patch with CHANGES.txt

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

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

        SOLR-10910: Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references

        Show
        jira-bot ASF subversion and git services added a comment - Commit 8f71bb40a55f6e7906e596938d0bf13900f77a94 in lucene-solr's branch refs/heads/master from Erick Erickson [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=8f71bb4 ] SOLR-10910 : Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references
        Hide
        jira-bot ASF subversion and git services added a comment -

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

        SOLR-10910: Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references

        (cherry picked from commit 8f71bb40a55f6e7906e596938d0bf13900f77a94)

        Show
        jira-bot ASF subversion and git services added a comment - Commit 7f279bba2e4b954b95c59afa3525253b5d53b4a1 in lucene-solr's branch refs/heads/branch_6x from Erick Erickson [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=7f279bb ] SOLR-10910 : Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references (cherry picked from commit 8f71bb40a55f6e7906e596938d0bf13900f77a94)
        Hide
        mkhludnev Mikhail Khludnev added a comment -

        fyi

        Build: https://builds.apache.org/job/Lucene-Solr-Tests-6.x/979/
        
        All tests passed
        
        Build Log:
        [...truncated 10237 lines...]
            [javac] Compiling 1096 source files to /x1/jenkins/jenkins-slave/workspace/Lucene-Solr-Tests-6.x/solr/build/solr-core/classes/java
            [javac] /x1/jenkins/jenkins-slave/workspace/Lucene-Solr-Tests-6.x/solr/core/src/java/org/apache/solr/core/SolrCore.java:2836: error: cannot find symbol
            [javac]         lst.add("aliases", coreContainer.getCoreNames(this));
            [javac]                                         ^
            [javac]   symbol:   method getCoreNames(SolrCore)
            [javac]   location: variable coreContainer of type CoreContainer
        
        Show
        mkhludnev Mikhail Khludnev added a comment - fyi Build: https: //builds.apache.org/job/Lucene-Solr-Tests-6.x/979/ All tests passed Build Log: [...truncated 10237 lines...] [javac] Compiling 1096 source files to /x1/jenkins/jenkins-slave/workspace/Lucene-Solr-Tests-6.x/solr/build/solr-core/classes/java [javac] /x1/jenkins/jenkins-slave/workspace/Lucene-Solr-Tests-6.x/solr/core/src/java/org/apache/solr/core/SolrCore.java:2836: error: cannot find symbol [javac] lst.add( "aliases" , coreContainer.getCoreNames( this )); [javac] ^ [javac] symbol: method getCoreNames(SolrCore) [javac] location: variable coreContainer of type CoreContainer
        Hide
        steve_rowe Steve Rowe added a comment -

        Yeah, branch_6x compilation is broken in multiple places.

        Show
        steve_rowe Steve Rowe added a comment - Yeah, branch_6x compilation is broken in multiple places.
        Hide
        erickerickson Erick Erickson added a comment -

        Hmm, builds for me. All tests run.

        Let me dig

        Show
        erickerickson Erick Erickson added a comment - Hmm, builds for me. All tests run. Let me dig
        Hide
        erickerickson Erick Erickson added a comment -

        Oh crap, didn't commit before pushing.

        Show
        erickerickson Erick Erickson added a comment - Oh crap, didn't commit before pushing.
        Hide
        jira-bot ASF subversion and git services added a comment - - edited

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

        SOLR-10910: Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references, didn't commit after merging and before I pushed last night

        Show
        jira-bot ASF subversion and git services added a comment - - edited Commit 9947a811e83cc0f848f9ddaa37a4137f19efff1a in lucene-solr's branch refs/heads/branch_6x from Erick Erickson [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=9947a81 ] SOLR-10910 : Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references, didn't commit after merging and before I pushed last night
        Hide
        jira-bot ASF subversion and git services added a comment -

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

        SOLR-10910: Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references, backport to 6.6.1

        Show
        jira-bot ASF subversion and git services added a comment - Commit b146c91e366093a0b6577e112c0aeb06d6a6898b in lucene-solr's branch refs/heads/branch_6_6 from Erick [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=b146c91 ] SOLR-10910 : Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references, backport to 6.6.1

          People

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

            Dates

            • Created:
              Updated:
              Resolved:

              Development