Skip to content

Conversation

@DarshitChanpura
Copy link
Member

@DarshitChanpura DarshitChanpura commented Jul 11, 2023

This reverts commit cd82f4c.

Reverting due to: #8652

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@DarshitChanpura DarshitChanpura changed the base branch from 2.x to 2.9 July 11, 2023 23:42
@DarshitChanpura DarshitChanpura removed the backport 2.9 Backport to 2.9 branch label Jul 11, 2023
@owaiskazi19 owaiskazi19 changed the title Revert "[Backport 2.x] Support transport action names when registering NamedRoutes (#7957) (#8459)" Revert "[Backport 2.9] Support transport action names when registering NamedRoutes (#7957) (#8459)" Jul 11, 2023
Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

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

@dbwiddis another pair of eyes

@owaiskazi19 owaiskazi19 changed the title Revert "[Backport 2.9] Support transport action names when registering NamedRoutes (#7957) (#8459)" [2.9] Revert "Support transport action names when registering NamedRoutes (#7957) (#8459)" Jul 11, 2023
@dbwiddis dbwiddis added backport 2.x Backport to 2.x branch backport 2.9 Backport to 2.9 branch labels Jul 12, 2023
Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

QQ: I see this also reverts the bump of azure-storage-blob. Is that intended?

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      3 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication

@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Merging #8651 (6c0d877) into 2.9 (54eef1f) will decrease coverage by 0.38%.
The diff coverage is 90.47%.

@@             Coverage Diff              @@
##                2.9    #8651      +/-   ##
============================================
- Coverage     71.05%   70.68%   -0.38%     
+ Complexity    57461    57182     -279     
============================================
  Files          4745     4746       +1     
  Lines        270757   270727      -30     
  Branches      39961    39953       -8     
============================================
- Hits         192390   191365    -1025     
- Misses        62154    62922     +768     
- Partials      16213    16440     +227     
Impacted Files Coverage Δ
...extensions/rest/RestInitializeExtensionAction.java 65.43% <0.00%> (ø)
.../main/java/org/opensearch/action/ActionModule.java 96.02% <77.77%> (-0.32%) ⬇️
...a/org/opensearch/extensions/rest/RouteHandler.java 90.00% <90.00%> (ø)
...rch/extensions/rest/RestSendToExtensionAction.java 46.66% <100.00%> (+4.16%) ⬆️
.../src/main/java/org/opensearch/rest/NamedRoute.java 100.00% <100.00%> (+4.65%) ⬆️

... and 465 files with indirect coverage changes

@DarshitChanpura
Copy link
Member Author

QQ: I see this also reverts the bump of azure-storage-blob. Is that intended?

fixed.

…g NamedRoutes (opensearch-project#7957) (opensearch-project#8459)"

This reverts commit cd82f4c.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@DarshitChanpura
Copy link
Member Author

@dbwiddis this PR is based to 2.9. We can remove backport 2.x and backport 2.9 labels

@DarshitChanpura DarshitChanpura removed backport 2.x Backport to 2.x branch backport 2.9 Backport to 2.9 branch labels Jul 12, 2023
@dbwiddis
Copy link
Member

LGTM. Please double check that the change log entry in 2.x is handled properly and this isn't included in the 2.9 section.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationRemoteStoreIT.testReplicationAfterForceMerge

@DarshitChanpura
Copy link
Member Author

The changelog entry is correct in 2.x, as this is present in 2.x. The entry is removed only from this branch.

@nknize nknize merged commit 4890548 into opensearch-project:2.9 Jul 12, 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.

4 participants