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

Add node name back to the core level responses in OverseerMessageHandler

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 5.5.1, 6.0, master (7.0)
    • Component/s: None
    • Labels:
      None

      Description

      Continuing from SOLR-8789, now that this test runs, time to fix it.

      1. SOLR-8790.patch
        2 kB
        Anshum Gupta
      2. SOLR-8790-followup.patch
        3 kB
        Varun Thacker

        Activity

        Hide
        jira-bot ASF subversion and git services added a comment -

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

        SOLR-8790: Ignoring failing CollectionsAPISolrJTest test until this is fixed

        Show
        jira-bot ASF subversion and git services added a comment - Commit 81feea2505103f4f0bcc4f6a84d9ea9b99e7ecb5 in lucene-solr's branch refs/heads/master from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=81feea2 ] SOLR-8790 : Ignoring failing CollectionsAPISolrJTest test until this is fixed
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit 2055b64ca10c66b5fe5f63c3ec3a845c567aadda in lucene-solr's branch refs/heads/branch_6x from anshum
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=2055b64 ]

        SOLR-8790: Ignoring failing CollectionsAPISolrJTest test until this is fixed

        Show
        jira-bot ASF subversion and git services added a comment - Commit 2055b64ca10c66b5fe5f63c3ec3a845c567aadda in lucene-solr's branch refs/heads/branch_6x from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=2055b64 ] SOLR-8790 : Ignoring failing CollectionsAPISolrJTest test until this is fixed
        Hide
        anshumg Anshum Gupta added a comment -

        Ignored the test to unblock Jenkins. I'll take a look at it later tonight.

        Show
        anshumg Anshum Gupta added a comment - Ignored the test to unblock Jenkins. I'll take a look at it later tonight.
        Hide
        anshumg Anshum Gupta added a comment -

        git bisect led to this commit:

        [a2e5c37c85acc7692d6fbcc29866a70db4f8be2e] SOLR-8534: Add generic support for collection APIs to be async

        I'll take a look and fix. I'm fairly certain that the commit changed the response returned from Solr.

        Show
        anshumg Anshum Gupta added a comment - git bisect led to this commit: [a2e5c37c85acc7692d6fbcc29866a70db4f8be2e] SOLR-8534 : Add generic support for collection APIs to be async I'll take a look and fix. I'm fairly certain that the commit changed the response returned from Solr.
        Hide
        anshumg Anshum Gupta added a comment -

        Nicholas Knize I'd like to get this into 6.0 as this is regression.

        Show
        anshumg Anshum Gupta added a comment - Nicholas Knize I'd like to get this into 6.0 as this is regression.
        Hide
        jira-bot ASF subversion and git services added a comment -

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

        SOLR-8790: Add the node name to core responses in calls from the Overseer

        Show
        jira-bot ASF subversion and git services added a comment - Commit 209f5c2946c8816a7ab175dc5e886ea661d154a5 in lucene-solr's branch refs/heads/master from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=209f5c2 ] SOLR-8790 : Add the node name to core responses in calls from the Overseer
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit 8fe11a06ce9e8bfef99184b1849e459b15691bf2 in lucene-solr's branch refs/heads/branch_6x from anshum
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=8fe11a0 ]

        SOLR-8790: Add the node name to core responses in calls from the Overseer

        Show
        jira-bot ASF subversion and git services added a comment - Commit 8fe11a06ce9e8bfef99184b1849e459b15691bf2 in lucene-solr's branch refs/heads/branch_6x from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=8fe11a0 ] SOLR-8790 : Add the node name to core responses in calls from the Overseer
        Hide
        varunthacker Varun Thacker added a comment -

        Hi Anshum,

        Thanks for fixing the code! Patch looks good

        Just looking at the OverseerCollectionMessageHandler there are different things being set as nodeName in different places:

        For example,
        processRebalanceLeaders does this - sreq.nodeName = message.getStr(ZkStateReader.CORE_NAME_PROP);
        addReplica does this - String node = message.getStr(CoreAdminParams.NODE);

        Everyone else sets nodeName as ZkStateReader.NODE_NAME_PROP

        I think we should also add some javadocs to sendShardRequest and ShardRequest.java

        Show
        varunthacker Varun Thacker added a comment - Hi Anshum, Thanks for fixing the code! Patch looks good Just looking at the OverseerCollectionMessageHandler there are different things being set as nodeName in different places: For example, processRebalanceLeaders does this - sreq.nodeName = message.getStr(ZkStateReader.CORE_NAME_PROP); addReplica does this - String node = message.getStr(CoreAdminParams.NODE); Everyone else sets nodeName as ZkStateReader.NODE_NAME_PROP I think we should also add some javadocs to sendShardRequest and ShardRequest.java
        Hide
        varunthacker Varun Thacker added a comment -

        AddReplica is fine. The API actually takes in a "node" parameter but internally it's used as "node_name".

        Show
        varunthacker Varun Thacker added a comment - AddReplica is fine. The API actually takes in a "node" parameter but internally it's used as "node_name".
        Hide
        varunthacker Varun Thacker added a comment -

        Here is a quick patch of what I was referring to.

        Show
        varunthacker Varun Thacker added a comment - Here is a quick patch of what I was referring to.
        Hide
        nknize Nicholas Knize added a comment -

        Anshum Gupta I'm okay with this making it in 6_0.

        Show
        nknize Nicholas Knize added a comment - Anshum Gupta I'm okay with this making it in 6_0.
        Hide
        anshumg Anshum Gupta added a comment -

        Varun Thacker The patch leads to failing TestRebalanceLeaders.
        You are trying to extract the NODE_NAME from message but that is always be null.

        message.getStr(ZkStateReader.NODE_NAME_PROP)
        

        Also, your patch loses this information:

        sreq.purpose = ShardRequest.PURPOSE_PRIVATE;
        
        Show
        anshumg Anshum Gupta added a comment - Varun Thacker The patch leads to failing TestRebalanceLeaders. You are trying to extract the NODE_NAME from message but that is always be null. message.getStr(ZkStateReader.NODE_NAME_PROP) Also, your patch loses this information: sreq.purpose = ShardRequest.PURPOSE_PRIVATE;
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit b4d52d60ac4413f7bd0cd83bcc3c94a00c6dcddf in lucene-solr's branch refs/heads/branch_6_0 from anshum
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=b4d52d6 ]

        SOLR-8790: Add the node name to core responses in calls from the Overseer

        Show
        jira-bot ASF subversion and git services added a comment - Commit b4d52d60ac4413f7bd0cd83bcc3c94a00c6dcddf in lucene-solr's branch refs/heads/branch_6_0 from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=b4d52d6 ] SOLR-8790 : Add the node name to core responses in calls from the Overseer
        Hide
        anshumg Anshum Gupta added a comment -

        backport for 5.5.1.

        Show
        anshumg Anshum Gupta added a comment - backport for 5.5.1.
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit cbb29d2a5ae4ab8741aab6c9f0806d4236c0cad0 in lucene-solr's branch refs/heads/branch_5x from anshum
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=cbb29d2 ]

        SOLR-8790: Add the node name to core responses in calls from the Overseer

        Show
        jira-bot ASF subversion and git services added a comment - Commit cbb29d2a5ae4ab8741aab6c9f0806d4236c0cad0 in lucene-solr's branch refs/heads/branch_5x from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=cbb29d2 ] SOLR-8790 : Add the node name to core responses in calls from the Overseer
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit bc08d7893fa6ba0bd0e9f37b72f014758f66b988 in lucene-solr's branch refs/heads/branch_5_5 from anshum
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=bc08d78 ]

        SOLR-8790: Add the node name to core responses in calls from the Overseer

        Show
        jira-bot ASF subversion and git services added a comment - Commit bc08d7893fa6ba0bd0e9f37b72f014758f66b988 in lucene-solr's branch refs/heads/branch_5_5 from anshum [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=bc08d78 ] SOLR-8790 : Add the node name to core responses in calls from the Overseer
        Hide
        hossman Hoss Man added a comment -

        Manually correcting fixVersion per Step #S6 of LUCENE-7271

        Show
        hossman Hoss Man added a comment - Manually correcting fixVersion per Step #S6 of LUCENE-7271

          People

          • Assignee:
            anshumg Anshum Gupta
            Reporter:
            anshumg Anshum Gupta
          • Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development