honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] refactor o.e.repositories in the server module. (#275) 

Refactor the repositories package in the server module to rename the package from `org.elasticsearch.repositories` to `org.opensearch.repositories`

Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
Rabi Panda 2021-03-11 16:16:18 -08:00 committed by Nick Knize
parent 2dd77e20aa
commit 6ee930ac0d
104 changed files with 245 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotIT.java
View File

@ -42,7 +42,7 @@ import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.rest.RestStatus;
import org.opensearch.snapshots.RestoreInfo;
import org.opensearch.snapshots.SnapshotInfo;

2
client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotRequestConvertersTests.java
View File

@ -36,7 +36,7 @@ import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.elasticsearch.test.ESTestCase;
import java.io.IOException;

2
client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java
View File

@ -52,7 +52,7 @@ import org.elasticsearch.common.Booleans;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.rest.RestStatus;
import org.opensearch.snapshots.RestoreInfo;
import org.opensearch.snapshots.SnapshotId;

2
modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
View File

@ -136,7 +136,7 @@ import org.elasticsearch.indices.analysis.PreBuiltCacheFactory.CachingStrategy;
import org.elasticsearch.plugins.AnalysisPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.ScriptPlugin;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.script.ScriptContext;
import org.opensearch.script.ScriptService;
import org.opensearch.threadpool.ThreadPool;

2
modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java
View File

@ -45,7 +45,7 @@ import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.ExtensiblePlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.ScriptPlugin;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler;
import org.opensearch.script.IngestScript;

2
modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java
View File

@ -40,7 +40,7 @@ import org.elasticsearch.index.reindex.ReindexAction;
import org.elasticsearch.index.reindex.UpdateByQueryAction;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler;
import org.opensearch.script.ScriptService;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java
View File

@ -48,7 +48,7 @@ import org.elasticsearch.index.reindex.ReindexRequestBuilder;
import org.elasticsearch.index.reindex.RemoteInfo;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.rest.RestHeaderDefinition;
import org.opensearch.rest.RestStatus;
import org.opensearch.script.ScriptService;

2
modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.opensearch.plugin.repository.url.URLRepositoryPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.snapshots.SnapshotState;
import org.elasticsearch.test.ESIntegTestCase;

2
modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.RepositoryPlugin;
import org.elasticsearch.repositories.Repository;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.url.URLRepository;
import java.util.Arrays;

4
modules/repository-url/src/main/java/org/opensearch/repositories/url/URLRepository.java
View File

@ -33,8 +33,8 @@ import org.elasticsearch.common.util.URIPattern;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.RepositoryException;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.RepositoryException;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import java.net.MalformedURLException;
import java.net.URISyntaxException;

4
modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java
View File

@ -26,8 +26,8 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.RepositoryException;
import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.repositories.RepositoryException;
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
import org.elasticsearch.test.ESTestCase;
import java.io.IOException;

2
modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.rest.RestStatus;
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;

2
modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java
View File

@ -33,7 +33,7 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.plugins.ClusterPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.script.ScriptService;
import org.opensearch.threadpool.Scheduler;
import org.opensearch.threadpool.ThreadPool;

12
server/src/main/java/org/elasticsearch/OpenSearchException.java
View File

@ -884,8 +884,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
// 80 was IndexFailedEngineException, deprecated in 6.0, removed in 7.0
INDEX_SHARD_RESTORE_FAILED_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreFailedException.class,
org.elasticsearch.index.snapshots.IndexShardRestoreFailedException::new, 81, UNKNOWN_VERSION_ADDED),
REPOSITORY_EXCEPTION(org.elasticsearch.repositories.RepositoryException.class,
org.elasticsearch.repositories.RepositoryException::new, 82, UNKNOWN_VERSION_ADDED),
REPOSITORY_EXCEPTION(org.opensearch.repositories.RepositoryException.class,
org.opensearch.repositories.RepositoryException::new, 82, UNKNOWN_VERSION_ADDED),
RECEIVE_TIMEOUT_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ReceiveTimeoutTransportException.class,
org.elasticsearch.transport.ReceiveTimeoutTransportException::new, 83, UNKNOWN_VERSION_ADDED),
NODE_DISCONNECTED_EXCEPTION(org.elasticsearch.transport.NodeDisconnectedException.class,
@ -927,8 +927,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
org.elasticsearch.cluster.routing.RoutingException::new, 105, UNKNOWN_VERSION_ADDED),
INDEX_SHARD_RECOVERY_EXCEPTION(org.elasticsearch.index.shard.IndexShardRecoveryException.class,
org.elasticsearch.index.shard.IndexShardRecoveryException::new, 106, UNKNOWN_VERSION_ADDED),
REPOSITORY_MISSING_EXCEPTION(org.elasticsearch.repositories.RepositoryMissingException.class,
org.elasticsearch.repositories.RepositoryMissingException::new, 107, UNKNOWN_VERSION_ADDED),
REPOSITORY_MISSING_EXCEPTION(org.opensearch.repositories.RepositoryMissingException.class,
org.opensearch.repositories.RepositoryMissingException::new, 107, UNKNOWN_VERSION_ADDED),
DOCUMENT_SOURCE_MISSING_EXCEPTION(org.elasticsearch.index.engine.DocumentSourceMissingException.class,
org.elasticsearch.index.engine.DocumentSourceMissingException::new, 109, UNKNOWN_VERSION_ADDED),
// 110 used to be FlushNotAllowedEngineException
@ -950,8 +950,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
org.elasticsearch.OpenSearchTimeoutException::new, 118, UNKNOWN_VERSION_ADDED),
QUERY_PHASE_EXECUTION_EXCEPTION(org.elasticsearch.search.query.QueryPhaseExecutionException.class,
org.elasticsearch.search.query.QueryPhaseExecutionException::new, 119, UNKNOWN_VERSION_ADDED),
REPOSITORY_VERIFICATION_EXCEPTION(org.elasticsearch.repositories.RepositoryVerificationException.class,
org.elasticsearch.repositories.RepositoryVerificationException::new, 120, UNKNOWN_VERSION_ADDED),
REPOSITORY_VERIFICATION_EXCEPTION(org.opensearch.repositories.RepositoryVerificationException.class,
org.opensearch.repositories.RepositoryVerificationException::new, 120, UNKNOWN_VERSION_ADDED),
INVALID_AGGREGATION_PATH_EXCEPTION(org.elasticsearch.search.aggregations.InvalidAggregationPathException.class,
org.elasticsearch.search.aggregations.InvalidAggregationPathException::new, 121, UNKNOWN_VERSION_ADDED),
// 123 used to be IndexAlreadyExistsException and was renamed

2
server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetadata.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.repositories.RepositoryData;
import org.opensearch.repositories.RepositoryData;
import java.io.IOException;
import java.util.ArrayList;

6
server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.repositories.RepositoryData;
import org.opensearch.repositories.RepositoryData;
import java.io.IOException;
import java.util.Objects;
@ -104,7 +104,7 @@ public class RepositoryMetadata implements Writeable {
/**
* Returns the safe repository generation. {@link RepositoryData} for this generation is assumed to exist in the repository.
* All operations on the repository must be based on the {@link RepositoryData} at this generation.
* See package level documentation for the blob store based repositories {@link org.elasticsearch.repositories.blobstore} for details
* See package level documentation for the blob store based repositories {@link org.opensearch.repositories.blobstore} for details
* on how this value is used during snapshots.
* @return safe repository generation
*/
@ -116,7 +116,7 @@ public class RepositoryMetadata implements Writeable {
* Returns the pending repository generation. {@link RepositoryData} for this generation and all generations down to the safe
* generation {@link #generation} may exist in the repository and should not be reused for writing new {@link RepositoryData} to the
* repository.
* See package level documentation for the blob store based repositories {@link org.elasticsearch.repositories.blobstore} for details
* See package level documentation for the blob store based repositories {@link org.opensearch.repositories.blobstore} for details
* on how this value is used during snapshots.
*
* @return highest pending repository generation

2
server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import java.io.IOException;

2
server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
View File

@ -109,7 +109,7 @@ import org.elasticsearch.node.NodeRoleSettings;
import org.elasticsearch.persistent.PersistentTasksClusterService;
import org.elasticsearch.persistent.decider.EnableAssignmentDecider;
import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.script.ScriptService;
import org.elasticsearch.search.SearchModule;

4
server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View File

@ -146,8 +146,8 @@ import org.elasticsearch.indices.recovery.PeerRecoveryTargetService;
import org.elasticsearch.indices.recovery.RecoveryFailedException;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.indices.recovery.RecoveryTarget;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.rest.RestStatus;
import org.elasticsearch.search.suggest.completion.CompletionStats;
import org.opensearch.threadpool.ThreadPool;

4
server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java
View File

@ -51,8 +51,8 @@ import org.elasticsearch.index.snapshots.IndexShardRestoreFailedException;
import org.elasticsearch.index.store.Store;
import org.elasticsearch.index.translog.Translog;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.Repository;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.Repository;
import java.io.IOException;
import java.util.Arrays;

2
server/src/main/java/org/elasticsearch/indices/IndicesService.java
View File

@ -125,7 +125,7 @@ import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.node.Node;
import org.elasticsearch.plugins.IndexStorePlugin;
import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.script.ScriptService;
import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
import org.elasticsearch.search.internal.AliasFilter;

2
server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
View File

@ -68,7 +68,7 @@ import org.elasticsearch.indices.recovery.PeerRecoverySourceService;
import org.elasticsearch.indices.recovery.PeerRecoveryTargetService;
import org.elasticsearch.indices.recovery.RecoveryFailedException;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.elasticsearch.search.SearchService;
import org.opensearch.snapshots.SnapshotShardsService;
import org.opensearch.threadpool.ThreadPool;

2
server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryResponse.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.repositories.RepositoryCleanupResult;
import org.opensearch.repositories.RepositoryCleanupResult;
import java.io.IOException;

10
server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java
View File

@ -40,11 +40,11 @@ import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryCleanupResult;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryCleanupResult;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.snapshots.SnapshotsService;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

2
server/src/main/java/org/opensearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

2
server/src/main/java/org/opensearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
View File

@ -33,7 +33,7 @@ import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.repositories.RepositoryMissingException;
import org.opensearch.repositories.RepositoryMissingException;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

2
server/src/main/java/org/opensearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

2
server/src/main/java/org/opensearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

8
server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
View File

@ -37,10 +37,10 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.snapshots.SnapshotException;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;

8
server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
View File

@ -42,10 +42,10 @@ import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.common.util.set.Sets;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;

2
server/src/main/java/org/opensearch/cluster/RepositoryCleanupInProgress.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.repositories.RepositoryOperation;
import org.opensearch.repositories.RepositoryOperation;
import java.io.IOException;
import java.util.ArrayList;

2
server/src/main/java/org/opensearch/cluster/SnapshotDeletionsInProgress.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.repositories.RepositoryOperation;
import org.opensearch.repositories.RepositoryOperation;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotsService;

6
server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java
View File

@ -34,9 +34,9 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoryShardId;
import org.elasticsearch.repositories.RepositoryOperation;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoryShardId;
import org.opensearch.repositories.RepositoryOperation;
import org.opensearch.snapshots.InFlightShardSnapshotStates;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;

2
server/src/main/java/org/elasticsearch/repositories/FilterRepository.java → server/src/main/java/org/opensearch/repositories/FilterRepository.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.apache.lucene.index.IndexCommit;
import org.elasticsearch.Version;

2
server/src/main/java/org/elasticsearch/repositories/IndexId.java → server/src/main/java/org/opensearch/repositories/IndexId.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;

5
server/src/main/java/org/elasticsearch/repositories/IndexMetaDataGenerations.java → server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java
View File

@ -17,12 +17,11 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Nullable;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotsService;
import java.util.Collection;
import java.util.Collections;
@ -34,7 +33,7 @@ import java.util.stream.Collectors;
/**
* Tracks the blob uuids of blobs containing {@link IndexMetadata} for snapshots as well an identifier for each of these blobs.
* Before writing a new {@link IndexMetadata} blob during snapshot finalization in
* {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository#finalizeSnapshot} the identifier for an instance of
* {@link org.opensearch.repositories.blobstore.BlobStoreRepository#finalizeSnapshot} the identifier for an instance of
* {@link IndexMetadata} should be computed and then used to check if it already exists in the repository via
* {@link #getIndexMetaBlobId(String)}.
*/

4
server/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java → server/src/main/java/org/opensearch/repositories/RepositoriesModule.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.plugins.RepositoryPlugin;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

4
server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java → server/src/main/java/org/opensearch/repositories/RepositoriesService.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -49,7 +49,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.repositories.blobstore.MeteredBlobStoreRepository;
import org.opensearch.repositories.blobstore.MeteredBlobStoreRepository;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

2
server/src/main/java/org/elasticsearch/repositories/RepositoriesStatsArchive.java → server/src/main/java/org/opensearch/repositories/RepositoriesStatsArchive.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

4
server/src/main/java/org/elasticsearch/repositories/Repository.java → server/src/main/java/org/opensearch/repositories/Repository.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.apache.lucene.index.IndexCommit;
import org.elasticsearch.Version;
@ -193,7 +193,7 @@ public interface Repository extends LifecycleComponent {
/**
* Verifies repository settings on data node.
* @param verificationToken value returned by {@link org.elasticsearch.repositories.Repository#startVerification()}
* @param verificationToken value returned by {@link org.opensearch.repositories.Repository#startVerification()}
* @param localNode the local node information, for inclusion in verification errors
*/
void verify(String verificationToken, DiscoveryNode localNode);

2
server/src/main/java/org/elasticsearch/repositories/RepositoryCleanupResult.java → server/src/main/java/org/opensearch/repositories/RepositoryCleanupResult.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.Strings;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryData.java → server/src/main/java/org/opensearch/repositories/RepositoryData.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.OpenSearchParseException;
import org.elasticsearch.ResourceNotFoundException;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryException.java → server/src/main/java/org/opensearch/repositories/RepositoryException.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.OpenSearchException;
import org.elasticsearch.common.io.stream.StreamInput;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryInfo.java → server/src/main/java/org/opensearch/repositories/RepositoryInfo.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.Strings;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java → server/src/main/java/org/opensearch/repositories/RepositoryMissingException.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.io.stream.StreamInput;
import org.opensearch.rest.RestStatus;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryOperation.java → server/src/main/java/org/opensearch/repositories/RepositoryOperation.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
/**
* Coordinates of an operation that modifies a repository, assuming that repository at a specific generation.

2
server/src/main/java/org/elasticsearch/repositories/RepositoryShardId.java → server/src/main/java/org/opensearch/repositories/RepositoryShardId.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryStats.java → server/src/main/java/org/opensearch/repositories/RepositoryStats.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryStatsSnapshot.java → server/src/main/java/org/opensearch/repositories/RepositoryStatsSnapshot.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;

2
server/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java → server/src/main/java/org/opensearch/repositories/RepositoryVerificationException.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.io.stream.StreamInput;
import org.opensearch.rest.RestStatus;

2
server/src/main/java/org/elasticsearch/repositories/ShardGenerations.java → server/src/main/java/org/opensearch/repositories/ShardGenerations.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;

2
server/src/main/java/org/elasticsearch/repositories/VerificationFailure.java → server/src/main/java/org/opensearch/repositories/VerificationFailure.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
public class VerificationFailure {

2
server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java → server/src/main/java/org/opensearch/repositories/VerifyNodeRepositoryAction.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import com.carrotsearch.hppc.ObjectContainer;
import com.carrotsearch.hppc.cursors.ObjectCursor;

26
server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java → server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -98,18 +98,18 @@ import org.elasticsearch.index.store.Store;
import org.elasticsearch.index.store.StoreFileMetadata;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.IndexMetaDataGenerations;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryCleanupResult;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.RepositoryException;
import org.elasticsearch.repositories.RepositoryOperation;
import org.elasticsearch.repositories.RepositoryShardId;
import org.elasticsearch.repositories.RepositoryStats;
import org.elasticsearch.repositories.RepositoryVerificationException;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.IndexMetaDataGenerations;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryCleanupResult;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.RepositoryException;
import org.opensearch.repositories.RepositoryOperation;
import org.opensearch.repositories.RepositoryShardId;
import org.opensearch.repositories.RepositoryStats;
import org.opensearch.repositories.RepositoryVerificationException;
import org.opensearch.snapshots.SnapshotCreationException;
import org.elasticsearch.repositories.ShardGenerations;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.snapshots.AbortedSnapshotException;
import org.opensearch.snapshots.SnapshotException;
import org.opensearch.snapshots.SnapshotId;
@ -152,7 +152,7 @@ import static org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSna
* {@link #createBlobStore()}.
* </p>
* For in depth documentation on how exactly implementations of this class interact with the snapshot functionality please refer to the
* documentation of the package {@link org.elasticsearch.repositories.blobstore}.
* documentation of the package {@link org.opensearch.repositories.blobstore}.
*/
public abstract class BlobStoreRepository extends AbstractLifecycleComponent implements Repository {
private static final Logger logger = LogManager.getLogger(BlobStoreRepository.class);

2
server/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java → server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.index.CorruptIndexException;

2
server/src/main/java/org/elasticsearch/repositories/blobstore/FileRestoreContext.java → server/src/main/java/org/opensearch/repositories/blobstore/FileRestoreContext.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

6
server/src/main/java/org/elasticsearch/repositories/blobstore/MeteredBlobStoreRepository.java → server/src/main/java/org/opensearch/repositories/blobstore/MeteredBlobStoreRepository.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.RepositoryInfo;
import org.elasticsearch.repositories.RepositoryStatsSnapshot;
import org.opensearch.repositories.RepositoryInfo;
import org.opensearch.repositories.RepositoryStatsSnapshot;
import org.opensearch.threadpool.ThreadPool;
import java.util.Map;

40
server/src/main/java/org/elasticsearch/repositories/blobstore/package-info.java → server/src/main/java/org/opensearch/repositories/blobstore/package-info.java
View File

@ -18,17 +18,17 @@
*/
/**
* <p>This package exposes the blobstore repository used by Elasticsearch Snapshots.</p>
* <p>This package exposes the blobstore repository used by OpenSearch Snapshots.</p>
*
* <h2>Preliminaries</h2>
*
* <p>The {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository} forms the basis of implementations of
* {@link org.elasticsearch.repositories.Repository} on top of a blob store. A blobstore can be used as the basis for an implementation
* <p>The {@link org.opensearch.repositories.blobstore.BlobStoreRepository} forms the basis of implementations of
* {@link org.opensearch.repositories.Repository} on top of a blob store. A blobstore can be used as the basis for an implementation
* as long as it provides for GET, PUT, DELETE, and LIST operations. For a read-only repository, it suffices if the blobstore provides only
* GET operations.
* These operations are formally defined as specified by the {@link org.elasticsearch.common.blobstore.BlobContainer} interface that
* any {@code BlobStoreRepository} implementation must provide via its implementation of
* {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository#getBlobContainer()}.</p>
* {@link org.opensearch.repositories.blobstore.BlobStoreRepository#getBlobContainer()}.</p>
*
* <p>The blob store is written to and read from by master-eligible nodes and data nodes. All metadata related to a snapshot's
* scope and health is written by the master node.</p>
@ -37,14 +37,14 @@
* the shard's segment files to the repository as well as metadata about all the segment files that the repository stores for the shard.</p>
*
* <p>For the specifics on how the operations on the repository documented below are invoked during the snapshot process please refer to
* the documentation of the {@link org.elasticsearch.snapshots} package.</p>
* the documentation of the {@link org.opensearch.snapshots} package.</p>
*
* <p>{@code BlobStoreRepository} maintains the following structure of blobs containing data and metadata in the blob store. The exact
* operations executed on these blobs are explained below.</p>
* <pre>
* {@code
* STORE_ROOT
* |- index-N - JSON serialized {@link org.elasticsearch.repositories.RepositoryData} containing a list of all snapshot ids
* |- index-N - JSON serialized {@link org.opensearch.repositories.RepositoryData } containing a list of all snapshot ids
* | and the indices belonging to each snapshot, N is the generation of the file
* |- index.latest - contains the numeric value of the latest generation of the index file (i.e. N from above)
* |- incompatible-snapshots - list of all snapshot ids that are no longer compatible with the current version of the cluster
@ -88,15 +88,15 @@
*
* <h2>Getting the Repository's RepositoryData</h2>
*
* <p>Loading the {@link org.elasticsearch.repositories.RepositoryData} that holds the list of all snapshots as well as the mapping of
* indices' names to their repository {@link org.elasticsearch.repositories.IndexId} is done by invoking
* {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository#getRepositoryData} and implemented as follows:</p>
* <p>Loading the {@link org.opensearch.repositories.RepositoryData} that holds the list of all snapshots as well as the mapping of
* indices' names to their repository {@link org.opensearch.repositories.IndexId} is done by invoking
* {@link org.opensearch.repositories.blobstore.BlobStoreRepository#getRepositoryData} and implemented as follows:</p>
* <ol>
* <li>
* <ol>
* <li>The blobstore repository stores the {@code RepositoryData} in blobs named with incrementing suffix {@code N} at {@code /index-N}
* directly under the repository's root.</li>
* <li>For each {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository} an entry of type
* <li>For each {@link org.opensearch.repositories.blobstore.BlobStoreRepository} an entry of type
* {@link org.elasticsearch.cluster.metadata.RepositoryMetadata} exists in the cluster state. It tracks the current valid
* generation {@code N} as well as the latest generation that a write was attempted for.</li>
* <li>The blobstore also stores the most recent {@code N} as a 64bit long in the blob {@code /index.latest} directly under the
@ -115,14 +115,14 @@
* <ol>
* <li>Use the just determined value of {@code N} and get the {@code /index-N} blob and deserialize the {@code RepositoryData} from it.</li>
* <li>If no value of {@code N} could be found since neither an {@code index.latest} nor any {@code index-N} blobs exist in the repository,
* it is assumed to be empty and {@link org.elasticsearch.repositories.RepositoryData#EMPTY} is returned.</li>
* it is assumed to be empty and {@link org.opensearch.repositories.RepositoryData#EMPTY} is returned.</li>
* </ol>
* </li>
* </ol>
*
* <h2>Writing Updated RepositoryData to the Repository</h2>
*
* <p>Writing an updated {@link org.elasticsearch.repositories.RepositoryData} to a blob store repository is an operation that uses
* <p>Writing an updated {@link org.opensearch.repositories.RepositoryData} to a blob store repository is an operation that uses
* the cluster state to ensure that a specific {@code index-N} blob is never accidentally overwritten in a master failover scenario.
* The specific steps to writing a new {@code index-N} blob and thus making changes from a snapshot-create or delete operation visible
* to read operations on the repository are as follows and all run on the master node:</p>
@ -137,7 +137,7 @@
* basis and that there is a chance for a stuck master-node to overwrite the contents of the {@code index.latest} blob after a newer
* {@code index-N} has been written by another master node. This is acceptable since the contents of {@code index.latest} are not used
* during normal operation of the repository and must only be correct for purposes of mounting the contents of a
* {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository} as a read-only url repository.</li>
* {@link org.opensearch.repositories.blobstore.BlobStoreRepository} as a read-only url repository.</li>
* <li>After the write has finished, set the value of {@code RepositoriesState.State#generation} to the value used for
* {@code RepositoriesState.State#pendingGeneration} so that the new entry for the state of the repository has {@code generation} and
* {@code pendingGeneration} set to the same value to signalize a clean repository state with no potentially failed writes newer than the
@ -159,7 +159,7 @@
*
* <p>In mixed version clusters that contain a node older than
* {@link org.opensearch.snapshots.SnapshotsService#NO_REPO_INITIALIZE_VERSION}, creating a snapshot in the repository starts with a
* call to {@link org.elasticsearch.repositories.Repository#initializeSnapshot} which the blob store repository implements via the
* call to {@link org.opensearch.repositories.Repository#initializeSnapshot} which the blob store repository implements via the
* following actions:</p>
* <ol>
* <li>Verify that no snapshot by the requested name exists.</li>
@ -172,7 +172,7 @@
* <h3>Writing Shard Data (Segments)</h3>
*
* <p>Once all the metadata has been written by the snapshot initialization, the snapshot process moves on to writing the actual shard data
* to the repository by invoking {@link org.elasticsearch.repositories.Repository#snapshotShard} on the data-nodes that hold the primaries
* to the repository by invoking {@link org.opensearch.repositories.Repository#snapshotShard} on the data-nodes that hold the primaries
* for the shards in the current snapshot. It is implemented as follows:</p>
*
* <p>Note:</p>
@ -185,7 +185,7 @@
* <li>Create the {@link org.apache.lucene.index.IndexCommit} for the shard to snapshot.</li>
* <li>Get the {@link org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshots} blob
* with name {@code index-${uuid}} with the {@code uuid} generation returned by
* {@link org.elasticsearch.repositories.ShardGenerations#getShardGen} to get the information of what segment files are
* {@link org.opensearch.repositories.ShardGenerations#getShardGen} to get the information of what segment files are
* already available in the blobstore.</li>
* <li>By comparing the files in the {@code IndexCommit} and the available file list from the previous step, determine the segment files
* that need to be written to the blob store. For each segment that needs to be added to the blob store, generate a unique name by combining
@ -201,7 +201,7 @@
* <h3>Finalizing the Snapshot</h3>
*
* <p>After all primaries have finished writing the necessary segment files to the blob store in the previous step, the master node moves on
* to finalizing the snapshot by invoking {@link org.elasticsearch.repositories.Repository#finalizeSnapshot}. This method executes the
* to finalizing the snapshot by invoking {@link org.opensearch.repositories.Repository#finalizeSnapshot}. This method executes the
* following actions in order:</p>
* <ol>
* <li>Write a blob containing the cluster metadata to the root of the blob store repository at {@code /meta-${snapshot-uuid}.dat}</li>
@ -215,7 +215,7 @@
* <h2>Deleting a Snapshot</h2>
*
* <p>Deleting a snapshot is an operation that is exclusively executed on the master node that runs through the following sequence of
* action when {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository#deleteSnapshots} is invoked:</p>
* action when {@link org.opensearch.repositories.blobstore.BlobStoreRepository#deleteSnapshots} is invoked:</p>
*
* <ol>
* <li>Get the current {@code RepositoryData} from the latest {@code index-N} blob at the repository root.</li>
@ -228,7 +228,7 @@
* <li>List all blobs in the shard path {@code /indices/${index-snapshot-uuid}} and build a new {@code BlobStoreIndexShardSnapshots} from
* the remaining {@code BlobStoreIndexShardSnapshot} blobs in the shard. Afterwards, write it to the next shard generation blob at
* {@code /indices/${index-snapshot-uuid}/${i}/index-${uuid}} (The shard's generation is determined from the map of shard generations in
* the {@link org.elasticsearch.repositories.RepositoryData} in the root {@code index-${N}} blob of the repository.</li>
* the {@link org.opensearch.repositories.RepositoryData} in the root {@code index-${N}} blob of the repository.</li>
* <li>Collect all segment blobs (identified by having the data blob prefix {@code __}) in the shard directory which are not referenced by
* the new {@code BlobStoreIndexShardSnapshots} that has been written in the previous step as well as the previous index-${uuid}
* blob so that it can be deleted at the end of the snapshot delete process.</li>
@ -244,4 +244,4 @@
* </li>
* </ol>
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;

6
server/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java → server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories.fs;
package org.opensearch.repositories.fs;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -32,8 +32,8 @@ import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.RepositoryException;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.RepositoryException;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import java.nio.file.Path;
import java.util.function.Function;

2
server/src/main/java/org/elasticsearch/repositories/package-info.java → server/src/main/java/org/opensearch/repositories/package-info.java
View File

@ -20,4 +20,4 @@
/**
* Repositories of snapshot/restore information.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;

8
server/src/main/java/org/opensearch/snapshots/InFlightShardSnapshotStates.java
View File

@ -23,9 +23,9 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.opensearch.cluster.SnapshotsInProgress;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoryShardId;
import org.elasticsearch.repositories.ShardGenerations;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoryShardId;
import org.opensearch.repositories.ShardGenerations;
import java.util.Collections;
import java.util.HashMap;
@ -38,7 +38,7 @@ import java.util.Set;
* Holds information about currently in-flight shard level snapshot or clone operations on a per-shard level.
* Concretely, this means information on which shards are actively being written to in the repository currently
* as well as the latest written shard generation per shard in case there is a shard generation for a shard that has
* been cleanly written out to the repository but not yet made part of the current {@link org.elasticsearch.repositories.RepositoryData}
* been cleanly written out to the repository but not yet made part of the current {@link org.opensearch.repositories.RepositoryData}
* through a snapshot finalization.
*/
public final class InFlightShardSnapshotStates {

6
server/src/main/java/org/opensearch/snapshots/InternalSnapshotsInfoService.java
View File

@ -40,9 +40,9 @@ import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.threadpool.ThreadPool;
import java.util.Collections;

8
server/src/main/java/org/opensearch/snapshots/RestoreService.java
View File

@ -73,10 +73,10 @@ import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.indices.ShardLimitValidator;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import java.util.ArrayList;
import java.util.Arrays;

2
server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java
View File

@ -34,7 +34,7 @@ import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParserUtils;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.rest.RestStatus;
import java.io.IOException;

8
server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java
View File

@ -50,10 +50,10 @@ import org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus.Stage;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.ShardGenerations;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportException;
import org.elasticsearch.transport.TransportRequestDeduplicator;

16
server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
View File

@ -47,7 +47,7 @@ import org.opensearch.cluster.RepositoryCleanupInProgress;
import org.opensearch.cluster.RestoreInProgress;
import org.opensearch.cluster.SnapshotDeletionsInProgress;
import org.opensearch.cluster.SnapshotsInProgress;
import org.elasticsearch.repositories.RepositoryShardId;
import org.opensearch.repositories.RepositoryShardId;
import org.opensearch.cluster.SnapshotsInProgress.ShardSnapshotStatus;
import org.opensearch.cluster.SnapshotsInProgress.ShardState;
import org.opensearch.cluster.SnapshotsInProgress.State;
@ -80,13 +80,13 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.RepositoryException;
import org.elasticsearch.repositories.RepositoryMissingException;
import org.elasticsearch.repositories.ShardGenerations;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.RepositoryException;
import org.opensearch.repositories.RepositoryMissingException;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

8
server/src/main/java/org/opensearch/snapshots/package-info.java
View File

@ -48,7 +48,7 @@
* {@link org.opensearch.snapshots.SnapshotShardsService#clusterChanged} on all nodes and since the entry is in state {@code STARTED}
* the {@code SnapshotShardsService} will check if any local primary shards are to be snapshotted (signaled by the shard's snapshot state
* being {@code INIT}). For those local primary shards found in state {@code INIT}) the snapshot process of writing the shard's data files
* to the snapshot's {@link org.elasticsearch.repositories.Repository} is executed. Once the snapshot execution finishes for a shard an
* to the snapshot's {@link org.opensearch.repositories.Repository} is executed. Once the snapshot execution finishes for a shard an
* {@code UpdateIndexShardSnapshotStatusRequest} is sent to the master node signaling either status {@code SUCCESS} or {@code FAILED}.
* The master node will then update a shard's state in the snapshots {@code SnapshotsInProgress.Entry} whenever it receives such a
* {@code UpdateIndexShardSnapshotStatusRequest}.</li>
@ -92,7 +92,7 @@
* {@link org.opensearch.cluster.SnapshotDeletionsInProgress}.</li>
*
* <li>Once the cluster state contains the deletion entry in {@code SnapshotDeletionsInProgress} the {@code SnapshotsService} will invoke
* {@link org.elasticsearch.repositories.Repository#deleteSnapshots} for the given snapshot, which will remove files associated with the
* {@link org.opensearch.repositories.Repository#deleteSnapshots} for the given snapshot, which will remove files associated with the
* snapshot from the repository as well as update its meta-data to reflect the deletion of the snapshot.</li>
*
* <li>After the deletion of the snapshot's data from the repository finishes, the {@code SnapshotsService} will submit a cluster state
@ -119,13 +119,13 @@
* <li>Once a placeholder task for the clone operation is put into the cluster state, we must determine the number of shards in each
* index that is to be cloned as well as ensure the health of the index snapshots in the source snapshot. In order to determine the
* shard count for each index that is to be cloned, we load the index metadata for each such index using the repository's
* {@link org.elasticsearch.repositories.Repository#getSnapshotIndexMetaData} method. In order to ensure the health of the source index
* {@link org.opensearch.repositories.Repository#getSnapshotIndexMetaData} method. In order to ensure the health of the source index
* snapshots, we load the {@link org.opensearch.snapshots.SnapshotInfo} for the source snapshot and check for shard snapshot
* failures of the relevant indices.</li>
* <li>Once all shard counts are known and the health of all source indices data has been verified, we populate the
* {@code SnapshotsInProgress.Entry#clones} map for the clone operation with the the relevant shard clone tasks.</li>
* <li>After the clone tasks have been added to the {@code SnapshotsInProgress.Entry}, master executes them on its snapshot thread-pool
* by invoking {@link org.elasticsearch.repositories.Repository#cloneShardSnapshot} for each shard that is to be cloned. Each completed
* by invoking {@link org.opensearch.repositories.Repository#cloneShardSnapshot} for each shard that is to be cloned. Each completed
* shard snapshot triggers a call to the {@link org.opensearch.snapshots.SnapshotsService#SHARD_STATE_EXECUTOR} which updates the
* clone's {@code SnapshotsInProgress.Entry} to mark the shard clone operation completed.</li>
* <li>Once all the entries in {@code SnapshotsInProgress.Entry#clones} have completed, the clone is finalized just like any other

2
server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInProgressException;

2
server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java
View File

@ -48,7 +48,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInProgressException;

2
server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.Version;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.SnapshotId;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.opensearch.snapshots.Snapshot;

2
server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java
View File

@ -39,7 +39,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.Index;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.elasticsearch.test.VersionUtils;

2
server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
View File

@ -54,7 +54,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.set.Sets;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.EmptySnapshotsInfoService;
import org.opensearch.snapshots.InternalSnapshotsInfoService;
import org.opensearch.snapshots.Snapshot;

2
server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java
View File

@ -46,7 +46,7 @@ import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.InternalSnapshotsInfoService;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;

2
server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
View File

@ -58,7 +58,7 @@ import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.EmptySnapshotsInfoService;
import org.opensearch.snapshots.InternalSnapshotsInfoService.SnapshotShard;
import org.opensearch.snapshots.Snapshot;

2
server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java
View File

@ -41,7 +41,7 @@ import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;

2
server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
View File

@ -122,7 +122,7 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.indices.recovery.RecoveryTarget;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.elasticsearch.test.CorruptionUtils;

2
server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java
View File

@ -44,7 +44,7 @@ import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedInd
import org.elasticsearch.indices.cluster.IndicesClusterStateService.Shard;
import org.elasticsearch.indices.recovery.PeerRecoveryTargetService;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.elasticsearch.test.ESTestCase;
import org.junit.Before;

2
server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java
View File

@ -53,7 +53,7 @@ import org.elasticsearch.index.seqno.RetentionLeaseSyncer;
import org.elasticsearch.index.shard.PrimaryReplicaSyncer;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.indices.recovery.PeerRecoveryTargetService;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.threadpool.TestThreadPool;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.Transport;

2
server/src/test/java/org/elasticsearch/repositories/IndexIdTests.java → server/src/test/java/org/opensearch/repositories/IndexIdTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.bytes.BytesReference;

2
server/src/test/java/org/elasticsearch/repositories/RepositoriesModuleTests.java → server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;

4
server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java → server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.apache.lucene.index.IndexCommit;
import org.elasticsearch.Version;
@ -48,7 +48,7 @@ import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
import org.elasticsearch.index.store.Store;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.repositories.blobstore.MeteredBlobStoreRepository;
import org.opensearch.repositories.blobstore.MeteredBlobStoreRepository;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;
import org.elasticsearch.test.ESTestCase;

2
server/src/test/java/org/elasticsearch/repositories/RepositoriesStatsArchiveTests.java → server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.unit.TimeValue;

4
server/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java → server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.elasticsearch.OpenSearchParseException;
import org.elasticsearch.Version;
@ -45,7 +45,7 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import static org.elasticsearch.repositories.RepositoryData.EMPTY_REPO_GEN;
import static org.opensearch.repositories.RepositoryData.EMPTY_REPO_GEN;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;

12
server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java → server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.TestUtil;
@ -45,11 +45,11 @@ import org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException;
import org.elasticsearch.index.store.Store;
import org.elasticsearch.index.store.StoreFileMetadata;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.ShardGenerations;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;

18
server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java → server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.elasticsearch.Version;
import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
@ -34,13 +34,13 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.RepositoryPlugin;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.RepositoryException;
import org.elasticsearch.repositories.ShardGenerations;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.RepositoryException;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotState;
import org.elasticsearch.test.ESIntegTestCase;
@ -55,7 +55,7 @@ import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import static org.elasticsearch.repositories.RepositoryDataTests.generateRandomRepoData;
import static org.opensearch.repositories.RepositoryDataTests.generateRandomRepoData;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;

6
server/src/test/java/org/elasticsearch/repositories/fs/FsRepositoryTests.java → server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories.fs;
package org.opensearch.repositories.fs;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@ -55,8 +55,8 @@ import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
import org.elasticsearch.index.store.Store;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.elasticsearch.test.DummyShardLock;

2
server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java
View File

@ -35,7 +35,7 @@ import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.translog.BufferedChecksumStreamOutput;
import org.elasticsearch.repositories.blobstore.ChecksumBlobStoreFormat;
import org.opensearch.repositories.blobstore.ChecksumBlobStoreFormat;
import org.elasticsearch.test.ESTestCase;
import java.io.EOFException;

8
server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java
View File

@ -46,10 +46,10 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
import org.elasticsearch.repositories.FilterRepository;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.opensearch.repositories.FilterRepository;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.ESTestCase;
import org.opensearch.threadpool.TestThreadPool;

12
server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
View File

@ -174,12 +174,12 @@ import org.elasticsearch.ingest.IngestService;
import org.elasticsearch.monitor.StatusInfo;
import org.elasticsearch.node.ResponseCollectorService;
import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil;
import org.elasticsearch.repositories.fs.FsRepository;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.script.ScriptService;
import org.elasticsearch.search.SearchService;
import org.elasticsearch.search.builder.SearchSourceBuilder;

2
server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.elasticsearch.test.AbstractDiffableWireSerializationTestCase;
import org.elasticsearch.test.VersionUtils;

4
server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java
View File

@ -35,8 +35,8 @@ import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoryShardId;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoryShardId;
import org.elasticsearch.test.ESTestCase;
import java.util.Arrays;

2
server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.io.Streams;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.snapshots.SnapshotInfo;
import org.elasticsearch.test.ESTestCase;

8
server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java
View File

@ -28,10 +28,10 @@ import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.ShardGenerations;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;
import org.elasticsearch.test.ESTestCase;

2
test/framework/src/main/java/org/elasticsearch/cluster/routing/TestShardRouting.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.repositories.IndexId;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
import org.elasticsearch.test.ESTestCase;

6
test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java
View File

@ -77,9 +77,9 @@ import org.elasticsearch.indices.recovery.RecoverySourceHandler;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.indices.recovery.RecoveryTarget;
import org.elasticsearch.indices.recovery.StartRecoveryRequest;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase;
import org.opensearch.snapshots.Snapshot;
import org.elasticsearch.test.DummyShardLock;
import org.elasticsearch.test.ESTestCase;

14
test/framework/src/main/java/org/elasticsearch/index/shard/RestoreOnlyRepository.java
View File

@ -31,12 +31,12 @@ import org.elasticsearch.common.component.AbstractLifecycleComponent;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
import org.elasticsearch.index.store.Store;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.IndexMetaDataGenerations;
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.RepositoryShardId;
import org.elasticsearch.repositories.ShardGenerations;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.IndexMetaDataGenerations;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.RepositoryShardId;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;
@ -48,7 +48,7 @@ import java.util.function.Consumer;
import java.util.function.Function;
import static java.util.Collections.emptyList;
import static org.elasticsearch.repositories.RepositoryData.EMPTY_REPO_GEN;
import static org.opensearch.repositories.RepositoryData.EMPTY_REPO_GEN;
/** A dummy repository for testing which just needs restore overridden */
public abstract class RestoreOnlyRepository extends AbstractLifecycleComponent implements Repository {

2
test/framework/src/main/java/org/elasticsearch/test/TestCluster.java
View File

@ -34,7 +34,7 @@ import org.elasticsearch.cluster.metadata.IndexTemplateMetadata;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.indices.IndexTemplateMissingException;
import org.elasticsearch.repositories.RepositoryMissingException;
import org.opensearch.repositories.RepositoryMissingException;
import java.io.Closeable;
import java.io.IOException;

6
test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java → test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories;
package org.opensearch.repositories;
import org.opensearch.action.ActionRunnable;
import org.opensearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryResponse;
@ -30,8 +30,8 @@ import org.elasticsearch.common.blobstore.BlobStore;
import org.elasticsearch.common.blobstore.support.PlainBlobMetadata;
import org.elasticsearch.common.settings.SecureSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.snapshots.SnapshotState;
import org.elasticsearch.test.ESSingleNodeTestCase;
import org.opensearch.threadpool.ThreadPool;

2
test/framework/src/main/java/org/elasticsearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java → test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpServer;

10
test/framework/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreTestUtil.java → test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.repositories.blobstore;
package org.opensearch.repositories.blobstore;
import org.apache.lucene.util.SameThreadExecutorService;
import org.elasticsearch.Version;
@ -44,10 +44,10 @@ import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.repositories.IndexId;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.repositories.RepositoryData;
import org.elasticsearch.repositories.ShardGenerations;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.repositories.RepositoryData;
import org.opensearch.repositories.ShardGenerations;
import org.opensearch.snapshots.SnapshotId;
import org.opensearch.snapshots.SnapshotInfo;
import org.elasticsearch.test.InternalTestCluster;

Some files were not shown because too many files have changed in this diff Show More