Skip to content

[Backport 2.x] Add connectToNodeAsExtension in TransportService#7346

Merged
owaiskazi19 merged 3 commits intoopensearch-project:2.xfrom
cwperks:backport/backport-6866-to-2.x
May 1, 2023
Merged

[Backport 2.x] Add connectToNodeAsExtension in TransportService#7346
owaiskazi19 merged 3 commits intoopensearch-project:2.xfrom
cwperks:backport/backport-6866-to-2.x

Conversation

@cwperks
Copy link
Member

@cwperks cwperks commented May 1, 2023

Backport #6866 to 2.x

…6866)

* Add connectToNodeAsExtension in TransportService

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update java docstrings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit b752555)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
CHANGELOG.md Outdated
- [Remote Store] Integrate remote segment store in peer recovery flow ([#6664](https://github.com/opensearch-project/OpenSearch/pull/6664))
- [Segment Replication] Add new cluster setting to set replication strategy by default for all indices in cluster. ([#6791](https://github.com/opensearch-project/OpenSearch/pull/6791))
- Enable sort optimization for all NumericTypes ([#6464](https://github.com/opensearch-project/OpenSearch/pull/6464)
- Remove 'cluster_manager' role attachment when using 'node.master' deprecated setting ([#6331](https://github.com/opensearch-project/OpenSearch/pull/6331))
Copy link
Member

@owaiskazi19 owaiskazi19 May 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we adding these changes to CHANGELOG? They have already been released in 2.7.
Just the below change should be enough for this PR.

Copy link
Member

@owaiskazi19 owaiskazi19 May 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I think this was missed during the review of #6866 . Since we are backporting it to 2.x and it will be released in 2.8 we don't need to add the CHANGELOG entry under unreleased 3.x but rather unreleased 2.x. This was the reason of the failed backport workflow. I would suggest to raise another PR on main and add the change under 2.x and remove it from 3.x.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, I used the merge conflict tool on github when resolving the conflict. I'm not sure how all of the other items got included.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented May 1, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented May 1, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.indices.replication.SegmentReplicationIT.testScrollWithOngoingSegmentReplication

@github-actions
Copy link
Contributor

github-actions bot commented May 1, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      2 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=pit/10_basic/Delete all}

@codecov-commenter
Copy link

Codecov Report

Merging #7346 (061cd05) into 2.x (59d59a6) will increase coverage by 0.01%.
The diff coverage is 0.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x    #7346      +/-   ##
============================================
+ Coverage     70.37%   70.38%   +0.01%     
+ Complexity    59731    59728       -3     
============================================
  Files          4850     4850              
  Lines        287193   287212      +19     
  Branches      41727    41728       +1     
============================================
+ Hits         202104   202147      +43     
+ Misses        68177    68147      -30     
- Partials      16912    16918       +6     
Impacted Files Coverage Δ
...ava/org/opensearch/transport/TransportService.java 78.68% <0.00%> (-1.83%) ⬇️

... and 499 files with indirect coverage changes

@owaiskazi19 owaiskazi19 merged commit 0bb44f0 into opensearch-project:2.x May 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments