Replace Version with RemoteVersion in reindex module #18457

HyunSangHan · 2025-06-06T16:27:22Z

Description

Replaces the usage of Version class with RemoteVersion class in the reindex module's remote components to provide better isolation and backward compatibility for remote reindex operations.

Related Issues

Resolves #18391

Check List

Functionality includes testing.
API changes companion pull request created, if applicable.
Public documentation issue/PR created, if applicable.

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.

github-actions · 2025-06-06T16:35:13Z

❌ Gradle check result for 03f243f: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

andrross · 2025-06-06T19:24:07Z

You've got a spotless code formatting failure here. You can fix it with ./gradlew :modules:reindex:spotlessApply.

Also note you can catch these failures locally by running ./gradlew precommit

github-actions · 2025-06-07T00:36:25Z

❕ Gradle check result for fed080e: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

codecov · 2025-06-07T00:36:44Z

Codecov Report

❌ Patch coverage is 92.00000% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 72.85%. Comparing base (40e9e40) to head (2c68c88).
⚠️ Report is 299 commits behind head on main.

Files with missing lines	Patch %	Lines
...ch/index/reindex/remote/RemoteRequestBuilders.java	70.00%	0 Missing and 3 partials ⚠️
...ndex/reindex/remote/RemoteScrollableHitSource.java	0.00%	2 Missing ⚠️
...opensearch/index/reindex/remote/RemoteVersion.java	98.27%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #18457      +/-   ##
============================================
+ Coverage     72.80%   72.85%   +0.05%     
- Complexity    68609    68690      +81     
============================================
  Files          5572     5573       +1     
  Lines        315196   315254      +58     
  Branches      45750    45760      +10     
============================================
+ Hits         229466   229691     +225     
+ Misses        67166    67004     -162     
+ Partials      18564    18559       -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

github-actions · 2025-06-09T15:56:07Z

❌ Gradle check result for 5d31637: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

github-actions · 2025-06-09T17:09:05Z

❕ Gradle check result for 5d31637: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteVersion.java

github-actions · 2025-06-19T16:02:19Z

❌ Gradle check result for b4ce564: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

github-actions · 2025-06-19T17:49:53Z

❕ Gradle check result for e823da8: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

opensearch-trigger-bot · 2025-07-21T15:23:12Z

This PR is stalled because it has been open for 30 days with no activity.

HyunSangHan · 2025-07-21T15:35:19Z

@andrross @msfroh
Could you please review this when you are available?

msfroh

Just a small callout on the comparator, but then I think this is ready to go. Thanks again, @HyunSangHan!

modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteVersion.java

github-actions · 2025-07-22T00:25:17Z

❌ Gradle check result for be045bd: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

msfroh · 2025-07-24T22:28:43Z

Okay -- I think this just about looks ready to go, but we're still getting one integ test failure:

java.lang.AssertionError: 
Expected: <9.12.2>
     but: was <9.12.1>
	at __randomizedtesting.SeedInfo.seed([EE855C2C432D1442:63E061706425D70B]:0)
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
	at org.junit.Assert.assertThat(Assert.java:964)
	at org.junit.Assert.assertThat(Assert.java:930)
	at org.opensearch.qa.verify_version_constants.VerifyVersionConstantsIT.testLuceneVersionConstant(VerifyVersionConstantsIT.java:56)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at com.carrotsearch.randomizedtesting.RandomizedRunner.invoke(RandomizedRunner.java:1750)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$8.evaluate(RandomizedRunner.java:938)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$9.evaluate(RandomizedRunner.java:974)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$10.evaluate(RandomizedRunner.java:988)

I think that's just a result of a Lucene update on the 2.19 branch. @HyunSangHan, can you please rebase onto the latest main branch and force-push the update?

HyunSangHan · 2025-07-24T23:07:43Z

I think that's just a result of a Lucene update on the 2.19 branch. @HyunSangHan, can you please rebase onto the latest main branch and force-push the update?

@msfroh Thanks! I did right before now.

github-actions · 2025-07-24T23:34:35Z

❌ Gradle check result for ba6c432: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

- Add RemoteVersion class with backward compatibility for Elasticsearch versions - Support version parsing from string with distribution parameter - Include version comparison methods (before, after, onOrAfter, onOrBefore) - Support both Elasticsearch and OpenSearch version constants This introduces a dedicated version class for remote reindex operations, isolating it from the global Version class while maintaining full backward compatibility with existing Elasticsearch clusters. Signed-off-by: Hyunsang Han <[email protected]>

- Replace Version class usage with RemoteVersion in remote reindex components - Update RemoteRequestBuilders to use RemoteVersion constants - Update RemoteResponseParsers with improved distribution handling - Update RemoteScrollableHitSource for version lookup compatibility This completes the migration from global Version class to dedicated RemoteVersion class in remote reindex functionality. Signed-off-by: Hyunsang Han <[email protected]>

Signed-off-by: Hyunsang Han <[email protected]>

Simplifies the RemoteVersion class by replacing the distribution string field with a boolean flag, making the code more readable and maintainable. Signed-off-by: Hyunsang Han <[email protected]>

Signed-off-by: Hyunsang Han <[email protected]>

github-actions · 2025-07-25T11:57:36Z

❌ Gradle check result for 2c68c88: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

opensearch-trigger-bot · 2025-08-25T15:22:52Z

This PR is stalled because it has been open for 30 days with no activity.

github-actions · 2025-08-25T16:51:05Z

❕ Gradle check result for 2c68c88: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

HyunSangHan · 2025-10-08T07:25:57Z

Hi @msfroh,
Hope you’re doing well.
I’m ready to get your feedback whenever you have time.
Thank you!

msfroh · 2025-10-09T00:06:56Z

Hey @HyunSangHan! Sorry for the delay, and thank you for tagging me.

I think this looks good and gets us even closer to cleaning up the Version class.

…ect#18457) - Add RemoteVersion class with backward compatibility for Elasticsearch versions - Support version parsing from string with distribution parameter - Include version comparison methods (before, after, onOrAfter, onOrBefore) - Support both Elasticsearch and OpenSearch version constants --------- Signed-off-by: Hyunsang Han <[email protected]>

HyunSangHan requested a review from a team as a code owner June 6, 2025 16:27

github-actions bot added enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers Other labels Jun 6, 2025

HyunSangHan mentioned this pull request Jun 6, 2025

[Cleanup] Modify RemoteScrollableHitSource and RemoteRequestBuilders to stop using the Version class #18391

Closed

HyunSangHan force-pushed the issue/18391 branch from 03f243f to fed080e Compare June 6, 2025 23:27

HyunSangHan force-pushed the issue/18391 branch from fed080e to 5d31637 Compare June 9, 2025 15:28

HyunSangHan closed this Jun 9, 2025

HyunSangHan reopened this Jun 9, 2025

opensearch-ci-bot mentioned this pull request Jun 9, 2025

[AUTOCUT] Gradle Check Flaky Test Report for SearchRestCancellationIT #14311

Open

opensearch-ci-bot mentioned this pull request Jun 18, 2025

[AUTOCUT] Gradle Check Flaky Test Report for SearchWeightedRoutingIT #15843

Open

msfroh reviewed Jun 18, 2025

View reviewed changes

HyunSangHan force-pushed the issue/18391 branch from b4ce564 to e823da8 Compare June 19, 2025 16:41

HyunSangHan requested a review from msfroh June 19, 2025 17:11

opensearch-trigger-bot bot added the stalled Issues that have stalled label Jul 21, 2025

msfroh reviewed Jul 21, 2025

View reviewed changes

modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteVersion.java Show resolved Hide resolved

HyunSangHan requested a review from msfroh July 21, 2025 23:41

opensearch-trigger-bot bot removed the stalled Issues that have stalled label Jul 23, 2025

msfroh added the skip-changelog label Jul 24, 2025

HyunSangHan force-pushed the issue/18391 branch from be045bd to ba6c432 Compare July 24, 2025 23:04

HyunSangHan added 5 commits July 25, 2025 20:28

Rename RemoteVersion constants for clarity

72d3cdb

Signed-off-by: Hyunsang Han <[email protected]>

Use boolean isOpenSearch instead of String distribution in RemoteVersion

18f04d2

Simplifies the RemoteVersion class by replacing the distribution string field with a boolean flag, making the code more readable and maintainable. Signed-off-by: Hyunsang Han <[email protected]>

Fix RemoteVersion comparison to prioritize OpenSearch over Elasticsearch

2c68c88

Signed-off-by: Hyunsang Han <[email protected]>

HyunSangHan force-pushed the issue/18391 branch from ba6c432 to 2c68c88 Compare July 25, 2025 11:28

opensearch-ci-bot mentioned this pull request Aug 6, 2025

[AUTOCUT] Gradle Check Flaky Test Report for ExampleSystemIngestProcessorClientYamlTestSuiteIT #18484

Open

opensearch-trigger-bot bot added the stalled Issues that have stalled label Aug 25, 2025

HyunSangHan closed this Aug 25, 2025

HyunSangHan reopened this Aug 25, 2025

opensearch-trigger-bot bot removed the stalled Issues that have stalled label Aug 26, 2025

msfroh approved these changes Oct 9, 2025

View reviewed changes

msfroh merged commit af2a8fc into opensearch-project:main Oct 9, 2025
63 of 65 checks passed

This was referenced Oct 22, 2025

[AUTOCUT] Gradle Check Flaky Test Report for VerifyVersionConstantsIT #14585

Open

[AUTOCUT] Gradle Check Flaky Test Report for IndexShardIT #19731

Open

Replace Version with RemoteVersion in reindex module #18457

Replace Version with RemoteVersion in reindex module #18457

Uh oh!

Conversation

HyunSangHan commented Jun 6, 2025

Description

Related Issues

Check List

Uh oh!

github-actions bot commented Jun 6, 2025

Uh oh!

andrross commented Jun 6, 2025

Uh oh!

github-actions bot commented Jun 7, 2025

Uh oh!

codecov bot commented Jun 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Jun 9, 2025

Uh oh!

github-actions bot commented Jun 9, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jun 19, 2025

Uh oh!

github-actions bot commented Jun 19, 2025

Uh oh!

opensearch-trigger-bot bot commented Jul 21, 2025

Uh oh!

HyunSangHan commented Jul 21, 2025

Uh oh!

msfroh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jul 22, 2025

Uh oh!

msfroh commented Jul 24, 2025

Uh oh!

HyunSangHan commented Jul 24, 2025

Uh oh!

github-actions bot commented Jul 24, 2025

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

opensearch-trigger-bot bot commented Aug 25, 2025

Uh oh!

github-actions bot commented Aug 25, 2025

Uh oh!

HyunSangHan commented Oct 8, 2025

Uh oh!

msfroh commented Oct 9, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Jun 7, 2025 •

edited

Loading