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

[Backport-2.x] Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility. #11114

Merged
merged 1 commit into from
Nov 9, 2023

Conversation

navneet1v
Copy link
Contributor

@navneet1v navneet1v commented Nov 6, 2023

Description

Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility.

Main branch PR: #11095

Related Issues

Resolves #10958

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • 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.

Copy link
Contributor

github-actions bot commented Nov 6, 2023

Compatibility status:

Checks if related components are compatible with change e1cb307

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

Copy link
Contributor

github-actions bot commented Nov 7, 2023

Gradle Check (Jenkins) Run Completed with:

@navneet1v
Copy link
Contributor Author

Gradle Check (Jenkins) Run Completed with:

Failed test results not related to this change:

[org.opensearch.search.aggregations.bucket.DiversifiedSamplerIT.testNestedDiversity {p0={"search.concurrent_segment_search.enabled":"true"}}](https://build.ci.opensearch.org/job/gradle-check/29622/testReport/junit/org.opensearch.search.aggregations.bucket/DiversifiedSamplerIT/testNestedDiversity__p0___search_concurrent_segment_search_enabled___true___/)
[org.opensearch.search.aggregations.bucket.DiversifiedSamplerIT.testSimpleDiversity {p0={"search.concurrent_segment_search.enabled":"true"}}](https://build.ci.opensearch.org/job/gradle-check/29622/testReport/junit/org.opensearch.search.aggregations.bucket/DiversifiedSamplerIT/testSimpleDiversity__p0___search_concurrent_segment_search_enabled___true___/)
[org.opensearch.search.suggest.CompletionSuggestSearchIT.testSkipDuplicates {p0={"search.concurrent_segment_search.enabled":"false"}}](https://build.ci.opensearch.org/job/gradle-check/29622/testReport/junit/org.opensearch.search.suggest/CompletionSuggestSearchIT/testSkipDuplicates__p0___search_concurrent_segment_search_enabled___false___/)
[org.opensearch.search.suggest.CompletionSuggestSearchIT.testSkipDuplicates {p0={"search.concurrent_segment_search.enabled":"true"}}](https://build.ci.opensearch.org/job/gradle-check/29622/testReport/junit/org.opensearch.search.suggest/CompletionSuggestSearchIT/testSkipDuplicates__p0___search_concurrent_segment_search_enabled___true___/)
[org.opensearch.action.admin.cluster.node.tasks.ResourceAwareTasksTests.testTaskResourceTrackingDuringTaskCancellation](https://build.ci.opensearch.org/job/gradle-check/29622/testReport/junit/org.opensearch.action.admin.cluster.node.tasks/ResourceAwareTasksTests/testTaskResourceTrackingDuringTaskCancellation/)

@navneet1v
Copy link
Contributor Author

Trying re-run again.

…x, to ensure backward compatibility.

Signed-off-by: Navneet Verma <navneev@amazon.com>
Copy link
Contributor

github-actions bot commented Nov 7, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 7, 2023

Gradle Check (Jenkins) Run Completed with:

@navneet1v
Copy link
Contributor Author

Gradle Check (Jenkins) Run Completed with:

[Test Result](https://build.ci.opensearch.org/job/gradle-check/29682/testReport/) (2 failures / -2)
[org.opensearch.repositories.azure.AzureBlobContainerRetriesTests.testWriteBlobWithRetries](https://build.ci.opensearch.org/job/gradle-check/29682/testReport/junit/org.opensearch.repositories.azure/AzureBlobContainerRetriesTests/testWriteBlobWithRetries/)
[org.opensearch.search.suggest.CompletionSuggestSearchIT.testSkipDuplicates {p0={"search.concurrent_segment_search.enabled":"false"}}](https://build.ci.opensearch.org/job/gradle-check/29682/testReport/junit/org.opensearch.search.suggest/CompletionSuggestSearchIT/testSkipDuplicates__p0___search_concurrent_segment_search_enabled___false___/)

Flaky tests.

#7934

#8932

Copy link
Contributor

github-actions bot commented Nov 7, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 8, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 8, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 8, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

@msfroh msfroh merged commit 559f678 into opensearch-project:2.x Nov 9, 2023
16 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

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

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.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/backport-2.11
# Create a new branch
git switch --create backport/backport-11114-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 559f678ea8e692c5132149278a21b5616de25b55
# Push it to GitHub
git push --set-upstream origin backport/backport-11114-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport/backport-11114-to-2.11.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.11 bug Something isn't working Geospatial
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants