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

Fix passing wrong parameter when calling newConfigurationException() in DotExpanderProcessor #10737

Merged
merged 5 commits into from
Oct 30, 2023

Conversation

gaobinlong
Copy link
Collaborator

@gaobinlong gaobinlong commented Oct 19, 2023

Description

When calling newConfigurationException(), the first parameter should be processor type, not the tag key, DotExpanderProcessor passes wrong parameter, but the final response of the API such as create ingest pipeline API and simulate API is not affected, that's because the root cause exception is wrapped into another exception, so the original processor type is overrode.

No other callers of the method have this problem.

Related Issues

#10734

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)
  • 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.

…in DotExpanderProcessor

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Gao Binlong <gbinlong@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Oct 19, 2023

Compatibility status:

Checks if related components are compatible with change bdc7736

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/security.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@gaobinlong
Copy link
Collaborator Author

Could anyone help to review this PR? It's pretty straightforward.

@reta
Copy link
Collaborator

reta commented Oct 30, 2023

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator

reta commented Oct 30, 2023

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator

reta commented Oct 30, 2023

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Oct 30, 2023

Codecov Report

Merging #10737 (bdc7736) into main (73bbeb5) will decrease coverage by 0.02%.
Report is 7 commits behind head on main.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main   #10737      +/-   ##
============================================
- Coverage     71.27%   71.25%   -0.02%     
- Complexity    58724    58754      +30     
============================================
  Files          4870     4870              
  Lines        276578   276578              
  Branches      40202    40202              
============================================
- Hits         197137   197082      -55     
- Misses        62986    63090     +104     
+ Partials      16455    16406      -49     
Files Coverage Δ
...opensearch/ingest/common/DotExpanderProcessor.java 97.43% <100.00%> (ø)

... and 491 files with indirect coverage changes

@reta reta merged commit 9d85e56 into opensearch-project:main Oct 30, 2023
17 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Oct 30, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-10737-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9d85e566894ef53e5f2093618b3d455e4d0a04ce
# Push it to GitHub
git push --set-upstream origin backport/backport-10737-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-10737-to-2.x.

@reta
Copy link
Collaborator

reta commented Oct 30, 2023

@gaobinlong could you please backport to 2.x manually?

gaobinlong added a commit to gaobinlong/OpenSearch that referenced this pull request Oct 31, 2023
…in DotExpanderProcessor (opensearch-project#10737)

* Fix passing wrong parameter when calling newConfigurationException() in DotExpanderProcessor

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* modify change log

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
(cherry picked from commit 9d85e56)
reta pushed a commit that referenced this pull request Nov 20, 2023
…in DotExpanderProcessor (#10737) (#11013)

* Fix passing wrong parameter when calling newConfigurationException() in DotExpanderProcessor

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* modify change log

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
(cherry picked from commit 9d85e56)

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…in DotExpanderProcessor (opensearch-project#10737)

* Fix passing wrong parameter when calling newConfigurationException() in DotExpanderProcessor

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* modify change log

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants