-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Integ test fix -> Fix broken backward compatibility from 2.7 for IndexSorted field indices #10045 #10087
Conversation
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Skipping changelog as related to this. |
@reta the fix for mixed cluster UT. Surprise it didnt fail in main but only on 2.x branches. I am updating 2.10 PR as well and that should be green |
I think because mixed cluster uses 3.x and 2.11.x which do not have the widening problem, vs 1.3.x and 2.11.x which do |
Ah, got it !! |
Compatibility status:Checks if related components are compatible with change 65537bf Incompatible componentsSkipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git] |
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #10087 +/- ##
============================================
+ Coverage 71.09% 71.11% +0.01%
+ Complexity 58152 58098 -54
============================================
Files 4825 4825
Lines 274031 274032 +1
Branches 39930 39930
============================================
+ Hits 194836 194890 +54
+ Misses 62881 62780 -101
- Partials 16314 16362 +48
|
The backport to
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-10087-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d7aa6dd9c7759bbfedd7263d453d3ac6c92fab7d
# Push it to GitHub
git push --set-upstream origin backport/backport-10087-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 |
I will raise seperate PR for backport of 2.x, clubbing with #10075 |
Let me cherry pick |
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> (cherry picked from commit d7aa6dd)
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> (cherry picked from commit d7aa6dd) Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
…rted field indices (#10075) * Fix broken backward compatibility from 2.7 for IndexSorted field indices (#10045) * Fix broken backward comparibility from 2.7 for IndexSorted field indices Signed-off-by: gashutos <gashutos@amazon.com> * Adding CHANGELOG Signed-off-by: gashutos <gashutos@amazon.com> * Update server/src/main/java/org/opensearch/index/IndexSettings.java Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com> * Removing unwanted logs Signed-off-by: gashutos <gashutos@amazon.com> * Removing unwanted logs Signed-off-by: gashutos <gashutos@amazon.com> * Adding index sort as part of mixed cluster to test this scenario Signed-off-by: gashutos <gashutos@amazon.com> * Removing optimization disable logic Signed-off-by: gashutos <gashutos@amazon.com> * Correcting some comments & version check to before( V_2_7_0) instead onOrBefire(V_2_6_1) since Signed-off-by: gashutos <gashutos@amazon.com> * Resolving spotless check error Signed-off-by: gashutos <gashutos@amazon.com> * Fixing broken UT - last minute checkin without copile Signed-off-by: gashutos <gashutos@amazon.com> * Improving code coverage to make codcov happy Signed-off-by: gashutos <gashutos@amazon.com> * Correcting typos and adding more tests Signed-off-by: gashutos <gashutos@amazon.com> * Removing unwanted imports Signed-off-by: gashutos <gashutos@amazon.com> --------- Signed-off-by: gashutos <gashutos@amazon.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com> (cherry picked from commit d34b352) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Finxing broken UT (#10087) Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> (cherry picked from commit d7aa6dd) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> --------- Signed-off-by: gashutos <gashutos@amazon.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com> Co-authored-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
While resolving one of comment, #10045 (comment)
I added
shouldWidenIndexSortTpe
as a class member and initialized from Settting.But
IndexSortConfig
constructor is always getting called beforeIndexSettings
determines the current version and putshouldWidenIndexSortTpe
in their class. SoshouldWidenIndexSortTpe
always stayed false after that change and lead failuers in integ testorg.opensearch.backwards.IndexingIT.testUpdateSnapshotStatus
in 2.10 branch.I am going to update this PR as well #10076