-
Notifications
You must be signed in to change notification settings - Fork 82
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
Test: bwc test for text chunking processor #661
Test: bwc test for text chunking processor #661
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #661 +/- ##
============================================
+ Coverage 84.04% 84.19% +0.14%
+ Complexity 744 743 -1
============================================
Files 59 59
Lines 2313 2309 -4
Branches 374 370 -4
============================================
Hits 1944 1944
Misses 214 214
+ Partials 155 151 -4 ☔ View full report in Codecov by Sentry. |
@yuye-aws Can you resolve the merge conflict? I will review this PR tonight |
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Have an interesting observation. The text chunking BWC test runs successfully when I create the index with 3 shards. However, the test get failed when I reduce the shard number from 3 to 1. You can refer to file |
To be specific, the error is due to |
@@ -130,4 +132,11 @@ protected void createPipelineForSparseEncodingProcessor(String modelId, String p | |||
); | |||
createPipelineProcessor(requestBody, pipelineName, modelId); | |||
} | |||
|
|||
protected void createPipelineForTextChunkingProcessor(String pipelineName) throws Exception { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems duplicate code with: https://github.com/opensearch-project/neural-search/pull/661/files#diff-721f0f5596bd046a060235fee514a17ee03d94be58ea10e7d39efc53662647deR106, any chance to make them common?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1, maybe we can have a utility class for common methods like this
qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java
Show resolved
Hide resolved
qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java
Show resolved
Hide resolved
Is there any assertion to confirm the index creation is successfully? Also check if other BWC tests has the same issue? Please identify the root cause of this since it could be a bug in test framework code. |
Created two sample PRs to test the Bug: #684 #685. In the first PR, the only difference is the index setting in file |
For index creation, there exists assertion in function |
Here is a snapshot of the error log in: #684
|
Both failing with this index_not_found_exception? |
Yes! |
I have created an issue: #690. Can we temporarily let go this issue? |
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
@@ -99,4 +101,11 @@ protected void createPipelineForSparseEncodingProcessor(final String modelId, fi | |||
); | |||
createPipelineProcessor(requestBody, pipelineName, modelId); | |||
} | |||
|
|||
protected void createPipelineForTextChunkingProcessor(String pipelineName) throws Exception { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make this identical to methods written above? Apart from this look good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
The BWC test failure is not caused by this change. |
The backport to
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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-661-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e69752c3824e73e7cd2302b112e02c5091a8f096
# Push it to GitHub
git push --set-upstream origin backport/backport-661-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
* bwc test for text chunking processor Signed-off-by: yuye-aws <yuyezhu@amazon.com> * spotless apply Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update changelog Signed-off-by: yuye-aws <yuyezhu@amazon.com> * spotless apply Signed-off-by: yuye-aws <yuyezhu@amazon.com> * add test document for restart upgrade Signed-off-by: yuye-aws <yuyezhu@amazon.com> * rename pipeline configuration file Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix pipeline create bug Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix pipeline create bug Signed-off-by: yuye-aws <yuyezhu@amazon.com> * filter tests for lower versions Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index validate in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * filter bwc test for lower version Signed-off-by: yuye-aws <yuyezhu@amazon.com> * bug fix in document ingestion in text chunking test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * ensure index creation in text chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * add comment Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update index setting Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update change log Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle comment format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * rename bwc test filename Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file to filter tests Signed-off-by: yuye-aws <yuyezhu@amazon.com> * merge method createPipelineProcessorWithoutModelId Signed-off-by: yuye-aws <yuyezhu@amazon.com> * text chunking processor it: create pipeline method rename Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix it failure Signed-off-by: yuye-aws <yuyezhu@amazon.com> * include index mapping for text chunking index setting Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update nitpicking Signed-off-by: yuye-aws <yuyezhu@amazon.com> --------- Signed-off-by: yuye-aws <yuyezhu@amazon.com> (cherry picked from commit e69752c)
* bwc test for text chunking processor Signed-off-by: yuye-aws <yuyezhu@amazon.com> * spotless apply Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update changelog Signed-off-by: yuye-aws <yuyezhu@amazon.com> * spotless apply Signed-off-by: yuye-aws <yuyezhu@amazon.com> * add test document for restart upgrade Signed-off-by: yuye-aws <yuyezhu@amazon.com> * rename pipeline configuration file Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix pipeline create bug Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix pipeline create bug Signed-off-by: yuye-aws <yuyezhu@amazon.com> * filter tests for lower versions Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index validate in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * filter bwc test for lower version Signed-off-by: yuye-aws <yuyezhu@amazon.com> * bug fix in document ingestion in text chunking test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * ensure index creation in text chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * add comment Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update index setting Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update change log Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle comment format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * rename bwc test filename Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file to filter tests Signed-off-by: yuye-aws <yuyezhu@amazon.com> * merge method createPipelineProcessorWithoutModelId Signed-off-by: yuye-aws <yuyezhu@amazon.com> * text chunking processor it: create pipeline method rename Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix it failure Signed-off-by: yuye-aws <yuyezhu@amazon.com> * include index mapping for text chunking index setting Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update nitpicking Signed-off-by: yuye-aws <yuyezhu@amazon.com> --------- Signed-off-by: yuye-aws <yuyezhu@amazon.com> (cherry picked from commit e69752c)
* Test: bwc test for text chunking processor (#661) * bwc test for text chunking processor Signed-off-by: yuye-aws <yuyezhu@amazon.com> * spotless apply Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update changelog Signed-off-by: yuye-aws <yuyezhu@amazon.com> * spotless apply Signed-off-by: yuye-aws <yuyezhu@amazon.com> * add test document for restart upgrade Signed-off-by: yuye-aws <yuyezhu@amazon.com> * rename pipeline configuration file Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix pipeline create bug Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix pipeline create bug Signed-off-by: yuye-aws <yuyezhu@amazon.com> * filter tests for lower versions Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index create in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * index validate in chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * filter bwc test for lower version Signed-off-by: yuye-aws <yuyezhu@amazon.com> * bug fix in document ingestion in text chunking test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * ensure index creation in text chunking bwc test Signed-off-by: yuye-aws <yuyezhu@amazon.com> * add comment Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update index setting Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update change log Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle comment format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * rename bwc test filename Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file format Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update gradle file to filter tests Signed-off-by: yuye-aws <yuyezhu@amazon.com> * merge method createPipelineProcessorWithoutModelId Signed-off-by: yuye-aws <yuyezhu@amazon.com> * text chunking processor it: create pipeline method rename Signed-off-by: yuye-aws <yuyezhu@amazon.com> * fix it failure Signed-off-by: yuye-aws <yuyezhu@amazon.com> * include index mapping for text chunking index setting Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update nitpicking Signed-off-by: yuye-aws <yuyezhu@amazon.com> --------- Signed-off-by: yuye-aws <yuyezhu@amazon.com> (cherry picked from commit e69752c) * remove unused import Signed-off-by: yuye-aws <yuyezhu@amazon.com> --------- Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Description
Implement backward compatibility test for text chunking processor : #607
Issues Resolved
BWC test issue: #647
Check List
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.