Skip to content

Fix cluster chaining during bootstrap#10020

Merged
shwetathareja merged 4 commits into
opensearch-project:mainfrom
soosinha:fix_cluster_chain
Sep 19, 2023
Merged

Fix cluster chaining during bootstrap#10020
shwetathareja merged 4 commits into
opensearch-project:mainfrom
soosinha:fix_cluster_chain

Conversation

@soosinha
Copy link
Copy Markdown
Member

Description

This fixes the logic for generating the cluster chain when a new cluster manager node is bootstrapping

Related Issues

#10019

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.

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

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 13, 2023

Compatibility status:

Checks if related components are compatible with change aa2105b

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/sql.git, https://github.com/opensearch-project/anomaly-detection.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/cross-cluster-replication.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.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/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git]

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

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

Gradle Check (Jenkins) Run Completed with:

Comment thread server/src/main/java/org/opensearch/gateway/GatewayMetaState.java
Comment thread server/src/main/java/org/opensearch/gateway/GatewayMetaState.java
Comment thread server/src/main/java/org/opensearch/gateway/GatewayMetaState.java
Comment thread server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java Outdated
Comment thread server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java Outdated
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha
Copy link
Copy Markdown
Member Author

@linuxpi

Here we are doing manifest.ifPresent(clusterMetadataManifest -> manifestsByClusterUUID.put(clusterUUID, clusterMetadataManifest))

We are deleting stale manifests and then the stale index metadata. When the stale manifest is deleted but the index metadata is yet to be deleted, the folder for the cluster UUID will still be present in the repository. So although we get the cluster UUID, there will not be any manifest for that UUID

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

Comment thread server/src/main/java/org/opensearch/gateway/GatewayMetaState.java
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      2 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=nodes.stats/20_response_filtering/Nodes Stats filtered using both includes and excludes filters}
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testRelocateWhileContinuouslyIndexingAndWaitingForRefresh
      1 org.opensearch.index.ShardIndexingPressureSettingsIT.testShardIndexingPressureEnforcedEnabledDisabledSetting
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=nodes.stats/11_indices_metrics/Metric - _all}

@shwetathareja shwetathareja merged commit 2a5b124 into opensearch-project:main Sep 19, 2023
@shwetathareja shwetathareja added backport 2.x Backport to 2.x branch backport 2.10 Backport to 2.10 branch labels Sep 19, 2023
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Sep 19, 2023
* Fix clusterUUID chaining logic

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
(cherry picked from commit 2a5b124)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Sep 19, 2023
* Fix clusterUUID chaining logic

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
(cherry picked from commit 2a5b124)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
sachinpkale pushed a commit that referenced this pull request Sep 19, 2023
* Fix clusterUUID chaining logic


(cherry picked from commit 2a5b124)

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>
@CEHENKLE
Copy link
Copy Markdown
Member

Hey @shwetathareja, @soosinha --

This looks more like a feature enhancement than a fix. We're in an release cycle, so we're not backporting any features while we prepare for release. I think it's best to pull out this change, because it puts our ability to get 2.11 out (we only have 4 more days to get a viable release candidate out).

Can you please revert it?

Thanks,
/C

@andrross
Copy link
Copy Markdown
Member

@CEHENKLE no need to revert as #10116 is the 2.10 backport and it is not yet merged

andrross pushed a commit that referenced this pull request Sep 19, 2023
* Fix clusterUUID chaining logic


(cherry picked from commit 2a5b124)

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>
@shwetathareja
Copy link
Copy Markdown
Member

@CEHENKLE for FYI, it was a fix for the corner case which was not handled in case there are multiple cluster UUIDs in remote which system can handle instead of throwing error to user.

brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
* Fix clusterUUID chaining logic

Signed-off-by: Sooraj Sinha <soosinha@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
* Fix clusterUUID chaining logic

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Fix clusterUUID chaining logic

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
@soosinha soosinha deleted the fix_cluster_chain branch December 20, 2024 06:57
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 backport 2.10 Backport to 2.10 branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants