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

Integ test fix -> Fix broken backward compatibility from 2.7 for IndexSorted field indices #10045 #10087

Merged
merged 1 commit into from
Sep 16, 2023

Conversation

gashutos
Copy link
Contributor

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 before IndexSettings determines the current version and put shouldWidenIndexSortTpe in their class. So shouldWidenIndexSortTpe always stayed false after that change and lead failuers in integ test org.opensearch.backwards.IndexingIT.testUpdateSnapshotStatus in 2.10 branch.

I am going to update this PR as well #10076

Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
@gashutos
Copy link
Contributor Author

Skipping changelog as related to this.
#10045

@gashutos
Copy link
Contributor Author

@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

@reta
Copy link
Collaborator

reta commented Sep 16, 2023

@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

@gashutos
Copy link
Contributor Author

@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 !!

@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 65537bf

Incompatible components

Skipped components

Compatible components

Compatible 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]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.index.shard.RemoteIndexShardTests.testRepicaCleansUpOldCommitsWhenReceivingNew

@codecov
Copy link

codecov bot commented Sep 16, 2023

Codecov Report

Merging #10087 (65537bf) into main (5fdd418) will increase coverage by 0.01%.
The diff coverage is 50.00%.

@@             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     
Files Changed Coverage Δ
...ain/java/org/opensearch/index/IndexSortConfig.java 73.17% <0.00%> (-0.33%) ⬇️
...c/main/java/org/opensearch/index/IndexService.java 76.03% <100.00%> (+0.54%) ⬆️

... and 433 files with indirect coverage changes

@reta reta merged commit d7aa6dd into opensearch-project:main Sep 16, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Sep 16, 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-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 base branch is 2.x and the compare/head branch is backport/backport-10087-to-2.x.

@gashutos
Copy link
Contributor Author

I will raise seperate PR for backport of 2.x, clubbing with #10075

@reta
Copy link
Collaborator

reta commented Sep 16, 2023

I will raise seperate PR for backport of 2.x, clubbing with #10075

Let me cherry pick

reta pushed a commit that referenced this pull request Sep 16, 2023
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
(cherry picked from commit d7aa6dd)
reta pushed a commit that referenced this pull request Sep 16, 2023
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>
reta added a commit that referenced this pull request Sep 18, 2023
…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>
sarthakaggarwal97 pushed a commit to sarthakaggarwal97/OpenSearch that referenced this pull request Sep 20, 2023
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
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>
vikasvb90 pushed a commit to vikasvb90/OpenSearch that referenced this pull request Oct 10, 2023
Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
Co-authored-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants