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

Fix valid cluster UUID logic for uncommitted cluster UUIDs #10916

Merged
merged 1 commit into from
Oct 26, 2023

Conversation

soosinha
Copy link
Member

@soosinha soosinha commented Oct 25, 2023

Description

When the condition that cluster UUID should be committed and it should be not be pointed to by any cluster UUIDs are applied simultaneously, it might skip all the cluster UUIDs. This can happen in case the last cluster UUID in a chain was uncommitted like below:

UUID1(committed) -> NA
UUID2(committed) -> UUID1(committed)
UUID3(uncommitted) -> UUID2(committed

So we need to first apply the condition of cluster UUID should be committed then reconstruct the graph and then apply the condition of clusterUUID not being pointed to by any cluster UUID.

Related Issues

#10911

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented. (Not Reqd)
    • New functionality has javadoc added (Not Reqd)
  • 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) (Not Reqd)
  • Public documentation issue/PR created (Not Reqd)

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
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Oct 25, 2023

Compatibility status:

Checks if related components are compatible with change c6cb296

Incompatible components

Incompatible components: [https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/performance-analyzer.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/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/common-utils.git, https://github.com/opensearch-project/observability.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/opensearch-oci-object-storage.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git]

@linuxpi
Copy link
Collaborator

linuxpi commented Oct 25, 2023

Can we add an integ test for this? maybe in a followup?

  1. form a cluster and let it commit to uuid1
  2. reset the cluster and let it commit to uuid2 pointing to uuid1
  3. reset the cluster and let it prepublish with uuid3 pointing to uuid2, but fail publish by introducing a network partition b/w cluster manager nodes
  4. reset the cluster and remove the network partition.
  5. new cluster forms with uuid4 and restores from uuid2

@soosinha soosinha force-pushed the valid-uuid-fix branch 2 times, most recently from 4c046be to 4a80235 Compare October 25, 2023 14:05
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@soosinha
Copy link
Member Author

Flaky tests: #7755, #10899

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@soosinha
Copy link
Member Author

Flaky tests: #10006, #10755, #10154

@shwetathareja shwetathareja merged commit 746ca09 into opensearch-project:main Oct 26, 2023
14 of 15 checks passed
@shwetathareja shwetathareja added the backport 2.x Backport to 2.x branch label Oct 26, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 26, 2023
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
(cherry picked from commit 746ca09)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
shwetathareja pushed a commit that referenced this pull request Oct 26, 2023
…10944)

(cherry picked from commit 746ca09)

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…h-project#10916)

Signed-off-by: Sooraj Sinha <soosinha@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
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants