Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manually backport #11060 (Simple regex normalization refactor) #11147

Merged
merged 2 commits into from
Nov 10, 2023

Conversation

stephen-crawford
Copy link
Contributor

Description

[Describe what this change achieves]

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

Signed-off-by: Stephen Crawford <[email protected]>
@reta reta added bug Something isn't working v2.12.0 Issues and PRs related to version 2.12.0 labels Nov 9, 2023
@stephen-crawford
Copy link
Contributor Author

@reta can you mark this 2.11 backport please?

@reta
Copy link
Collaborator

reta commented Nov 9, 2023

@reta can you mark this 2.11 backport please?

@scrawfor99 we need to align with the release team, @bbarani @CEHENKLE please signoff if we are OK bringing this one into 2.11.1, thank you

Copy link
Contributor

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 9, 2023

Compatibility status:

Checks if related components are compatible with change e0f6b38

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/alerting.git]

Signed-off-by: Stephen Crawford <[email protected]>
Copy link
Contributor

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

@bbarani
Copy link
Member

bbarani commented Nov 9, 2023

I am good with backporting this fix to 2.11 branch and release in 2.11.1 patch version.

@reta
Copy link
Collaborator

reta commented Nov 9, 2023

Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator

reta commented Nov 10, 2023

Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link

codecov bot commented Nov 10, 2023

Codecov Report

Merging #11147 (e0f6b38) into 2.x (870ecd3) will increase coverage by 0.05%.
Report is 8 commits behind head on 2.x.
The diff coverage is 58.54%.

@@             Coverage Diff              @@
##                2.x   #11147      +/-   ##
============================================
+ Coverage     70.98%   71.03%   +0.05%     
- Complexity    58895    58994      +99     
============================================
  Files          4851     4862      +11     
  Lines        278023   278385     +362     
  Branches      40765    40805      +40     
============================================
+ Hits         197358   197758     +400     
+ Misses        63872    63808      -64     
- Partials      16793    16819      +26     
Files Coverage Δ
...nsearch/http/netty4/Netty4HttpServerTransport.java 75.75% <ø> (ø)
...c/main/java/org/opensearch/common/regex/Regex.java 86.00% <100.00%> (-0.54%) ⬇️
...rg/opensearch/common/settings/ClusterSettings.java 92.85% <ø> (ø)
...ava/org/opensearch/http/HttpTransportSettings.java 96.15% <100.00%> (+0.07%) ⬆️
...http/reactor/netty4/ReactorNetty4HttpResponse.java 85.71% <85.71%> (ø)
...ansport/reactor/netty4/ReactorNetty4Transport.java 75.00% <75.00%> (ø)
...reactor/netty4/ReactorNetty4HttpServerChannel.java 83.33% <83.33%> (ø)
...g/opensearch/index/mapper/GeoShapeFieldMapper.java 80.00% <62.50%> (-3.64%) ⬇️
...h/http/reactor/netty4/NonStreamingHttpChannel.java 66.66% <66.66%> (ø)
...tp/reactor/netty4/NonStreamingRequestConsumer.java 77.77% <77.77%> (ø)
... and 6 more

... and 482 files with indirect coverage changes

@reta reta merged commit 725d505 into opensearch-project:2.x Nov 10, 2023
18 of 19 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/backport-2.11
# Create a new branch
git switch --create backport/backport-11147-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 725d505f49c7d319aa52e550febcaad07eb4e0bf
# Push it to GitHub
git push --set-upstream origin backport/backport-11147-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport/backport-11147-to-2.11.

@reta
Copy link
Collaborator

reta commented Nov 10, 2023

@scrawfor99 2.11 backport failed :(

cwperks pushed a commit to cwperks/OpenSearch that referenced this pull request Nov 13, 2023
…n refactor) (opensearch-project#11147)

* Manually backport 11060

Signed-off-by: Stephen Crawford <[email protected]>

* spotless

Signed-off-by: Stephen Crawford <[email protected]>

---------

Signed-off-by: Stephen Crawford <[email protected]>
(cherry picked from commit 725d505)
@cwperks
Copy link
Member

cwperks commented Nov 13, 2023

@reta @scrawfor99 I opened up a manual backport to 2.11: #11185

reta pushed a commit that referenced this pull request Nov 13, 2023
… (#11185)

* Manually backport 11060

Signed-off-by: Stephen Crawford <[email protected]>

* spotless

Signed-off-by: Stephen Crawford <[email protected]>

---------

Signed-off-by: Stephen Crawford <[email protected]>
(cherry picked from commit 725d505)

Co-authored-by: Stephen Crawford <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.11 bug Something isn't working v2.12.0 Issues and PRs related to version 2.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants