-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add POJO classes required for cluster state publication from remote (#…
…14006) * Add POJO classes required for cluster state publication from remote * Use InputStreams rather than XContent for serialization for ehpemeral objects Signed-off-by: Shivansh Arora <[email protected]> * Add remote routing table changes in diff Manifest Signed-off-by: Arpit Bandejiya <[email protected]>
- Loading branch information
Showing
26 changed files
with
3,399 additions
and
233 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
373 changes: 334 additions & 39 deletions
373
server/src/main/java/org/opensearch/gateway/remote/ClusterMetadataManifest.java
Large diffs are not rendered by default.
Oops, something went wrong.
659 changes: 656 additions & 3 deletions
659
server/src/main/java/org/opensearch/gateway/remote/ClusterStateDiffManifest.java
Large diffs are not rendered by default.
Oops, something went wrong.
118 changes: 118 additions & 0 deletions
118
server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.gateway.remote; | ||
|
|
||
| import org.opensearch.action.LatchedActionListener; | ||
| import org.opensearch.cluster.ClusterState; | ||
| import org.opensearch.cluster.ClusterState.Custom; | ||
| import org.opensearch.cluster.block.ClusterBlocks; | ||
| import org.opensearch.cluster.node.DiscoveryNodes; | ||
| import org.opensearch.common.CheckedRunnable; | ||
| import org.opensearch.common.remote.AbstractRemoteWritableBlobEntity; | ||
| import org.opensearch.core.action.ActionListener; | ||
| import org.opensearch.core.common.io.stream.NamedWriteableRegistry; | ||
| import org.opensearch.core.compress.Compressor; | ||
| import org.opensearch.core.xcontent.NamedXContentRegistry; | ||
| import org.opensearch.core.xcontent.ToXContent; | ||
| import org.opensearch.gateway.remote.model.RemoteClusterBlocks; | ||
| import org.opensearch.gateway.remote.model.RemoteClusterStateBlobStore; | ||
| import org.opensearch.gateway.remote.model.RemoteClusterStateCustoms; | ||
| import org.opensearch.gateway.remote.model.RemoteDiscoveryNodes; | ||
| import org.opensearch.gateway.remote.model.RemoteReadResult; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * A Manager which provides APIs to upload and download attributes of ClusterState to the {@link RemoteClusterStateBlobStore} | ||
| * | ||
| * @opensearch.internal | ||
| */ | ||
| public class RemoteClusterStateAttributesManager { | ||
| public static final String CLUSTER_STATE_ATTRIBUTE = "cluster_state_attribute"; | ||
| public static final String DISCOVERY_NODES = "nodes"; | ||
| public static final String CLUSTER_BLOCKS = "blocks"; | ||
| public static final int CLUSTER_STATE_ATTRIBUTES_CURRENT_CODEC_VERSION = 1; | ||
| private final RemoteClusterStateBlobStore<ClusterBlocks, RemoteClusterBlocks> clusterBlocksBlobStore; | ||
| private final RemoteClusterStateBlobStore<DiscoveryNodes, RemoteDiscoveryNodes> discoveryNodesBlobStore; | ||
| private final RemoteClusterStateBlobStore<Custom, RemoteClusterStateCustoms> customsBlobStore; | ||
| private final Compressor compressor; | ||
| private final NamedXContentRegistry namedXContentRegistry; | ||
| private final NamedWriteableRegistry namedWriteableRegistry; | ||
|
|
||
| RemoteClusterStateAttributesManager( | ||
| RemoteClusterStateBlobStore<ClusterBlocks, RemoteClusterBlocks> clusterBlocksBlobStore, | ||
| RemoteClusterStateBlobStore<DiscoveryNodes, RemoteDiscoveryNodes> discoveryNodesBlobStore, | ||
| RemoteClusterStateBlobStore<Custom, RemoteClusterStateCustoms> customsBlobStore, | ||
| Compressor compressor, | ||
| NamedXContentRegistry namedXContentRegistry, | ||
| NamedWriteableRegistry namedWriteableRegistry | ||
| ) { | ||
| this.clusterBlocksBlobStore = clusterBlocksBlobStore; | ||
| this.discoveryNodesBlobStore = discoveryNodesBlobStore; | ||
| this.customsBlobStore = customsBlobStore; | ||
| this.compressor = compressor; | ||
| this.namedXContentRegistry = namedXContentRegistry; | ||
| this.namedWriteableRegistry = namedWriteableRegistry; | ||
| } | ||
|
|
||
| /** | ||
| * Allows async upload of Cluster State Attribute components to remote | ||
| */ | ||
| CheckedRunnable<IOException> getAsyncMetadataWriteAction( | ||
| String component, | ||
| AbstractRemoteWritableBlobEntity blobEntity, | ||
| RemoteClusterStateBlobStore remoteEntityStore, | ||
| LatchedActionListener<ClusterMetadataManifest.UploadedMetadata> latchedActionListener | ||
| ) { | ||
| return () -> remoteEntityStore.writeAsync(blobEntity, getActionListener(component, blobEntity, latchedActionListener)); | ||
| } | ||
|
|
||
| private ActionListener<Void> getActionListener( | ||
| String component, | ||
| AbstractRemoteWritableBlobEntity remoteObject, | ||
| LatchedActionListener<ClusterMetadataManifest.UploadedMetadata> latchedActionListener | ||
| ) { | ||
| return ActionListener.wrap( | ||
| resp -> latchedActionListener.onResponse(remoteObject.getUploadedMetadata()), | ||
| ex -> latchedActionListener.onFailure(new RemoteStateTransferException(component, remoteObject, ex)) | ||
| ); | ||
| } | ||
|
|
||
| public CheckedRunnable<IOException> getAsyncMetadataReadAction( | ||
| String component, | ||
| AbstractRemoteWritableBlobEntity blobEntity, | ||
| RemoteClusterStateBlobStore remoteEntityStore, | ||
| LatchedActionListener<RemoteReadResult> listener | ||
| ) { | ||
| final ActionListener actionListener = ActionListener.wrap( | ||
| response -> listener.onResponse(new RemoteReadResult((ToXContent) response, CLUSTER_STATE_ATTRIBUTE, component)), | ||
| listener::onFailure | ||
| ); | ||
| return () -> remoteEntityStore.readAsync(blobEntity, actionListener); | ||
| } | ||
|
|
||
| public Map<String, ClusterState.Custom> getUpdatedCustoms(ClusterState clusterState, ClusterState previousClusterState) { | ||
| Map<String, ClusterState.Custom> updatedCustoms = new HashMap<>(); | ||
| Set<String> currentCustoms = new HashSet<>(clusterState.customs().keySet()); | ||
| for (Map.Entry<String, ClusterState.Custom> entry : previousClusterState.customs().entrySet()) { | ||
| if (currentCustoms.contains(entry.getKey()) && !entry.getValue().equals(clusterState.customs().get(entry.getKey()))) { | ||
| updatedCustoms.put(entry.getKey(), clusterState.customs().get(entry.getKey())); | ||
| } | ||
| currentCustoms.remove(entry.getKey()); | ||
| } | ||
| for (String custom : currentCustoms) { | ||
| updatedCustoms.put(custom, clusterState.customs().get(custom)); | ||
| } | ||
| return updatedCustoms; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.