Skip to content

Commit

Permalink
Handle version during repository registration for prefix mode verific…
Browse files Browse the repository at this point in the history
…ation (opensearch-project#16831)

Signed-off-by: Ashish Singh <[email protected]>
  • Loading branch information
ashking94 committed Dec 16, 2024
1 parent d8f7e48 commit d6200bf
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,13 @@ public ClusterState state() {
return clusterState;
}

/**
* Returns true if the appliedClusterState is not null
*/
public boolean isStateInitialised() {
return this.state.get() != null;
}

/**
* Returns true if the appliedClusterState is not null
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,13 @@ public ClusterState state() {
return clusterApplierService.state();
}

/**
* Returns true if the state in appliedClusterState is not null
*/
public boolean isStateInitialised() {
return clusterApplierService.isStateInitialised();
}

/**
* The state that is persisted to store but may not be applied to cluster.
* @return ClusterState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3093,7 +3093,11 @@ public String startVerification() {
*/
private BlobContainer testContainer(String seed) {
BlobPath testBlobPath;
if (prefixModeVerification == true) {
if (prefixModeVerification == true
&& (clusterService.isStateInitialised() == false
|| clusterService.state().nodes().getMinNodeVersion().onOrAfter(Version.V_2_17_0))) {
// During the remote store node bootstrap, the cluster state is not initialised
// Otherwise, the cluster state is initialised and available with the min node version information
BasePathInput pathInput = BasePathInput.builder().basePath(basePath()).indexUUID(seed).build();
testBlobPath = PathType.HASHED_PREFIX.path(pathInput, FNV_1A_COMPOSITE_1);
} else {
Expand Down

0 comments on commit d6200bf

Please sign in to comment.