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][Remote Store] Changes to perform repository registrati… #9809

Merged
merged 1 commit into from
Sep 6, 2023

Conversation

psychbot
Copy link
Member

@psychbot psychbot commented Sep 6, 2023

…on during bootstrap via node attributes. (#9105)

Signed-off-by: Dharmesh 💤 sdharms@amazon.com
(cherry picked from commit 9119b6d)

Description

Backport of #9105

Conflicting files due to repository service being introduced in JoinHelper

git cherry-pick -x --mainline 1 9119b6dc20ea11d95a399c68505f1d858b78e30e
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
CONFLICT (content): Merge conflict in server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java
CONFLICT (content): Merge conflict in server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
CONFLICT (content): Merge conflict in server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java
CONFLICT (content): Merge conflict in server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

…on during bootstrap via node attributes. (opensearch-project#9105)

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
(cherry picked from commit 9119b6d)
@github-actions
Copy link
Contributor

github-actions bot commented Sep 6, 2023

Compatibility status:

Checks if related components are compatible with change d15fb35

Incompatible components

Incompatible components: [https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/neural-search.git]

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/anomaly-detection.git, https://github.com/opensearch-project/index-management.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/reporting.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

@github-actions
Copy link
Contributor

github-actions bot commented Sep 6, 2023

Gradle Check (Jenkins) Run Completed with:

@psychbot
Copy link
Member Author

psychbot commented Sep 6, 2023

Fix for failing test is in progress - org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing
#9807

@gbbafna gbbafna merged commit bae4e76 into opensearch-project:2.x Sep 6, 2023
36 of 37 checks passed
@psychbot psychbot deleted the backport-9105 branch September 6, 2023 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants