Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[segment replication]Introducing common Replication interfaces for segment replication and recovery code paths #3234

Merged
merged 10 commits into from
May 23, 2022
Merged

[segment replication]Introducing common Replication interfaces for segment replication and recovery code paths #3234

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d381c0
RecoveryState inherits from ReplicationState + RecoveryTarget inherit…
Poojita-Raj May 3, 2022
ca0106a
Refactoring: mixedClusterVersion error fix + move Stage to Replicatio…
Poojita-Raj May 10, 2022
ba51c17
pull ReplicationListener into a top level class + add javadocs + addr…
Poojita-Raj May 12, 2022
d7fc756
fix javadoc
Poojita-Raj May 13, 2022
b84c184
review changes
Poojita-Raj May 17, 2022
8447624
Refactoring the hierarchy relationship between repl and recovery
Poojita-Raj May 18, 2022
5edeae3
style fix
Poojita-Raj May 18, 2022
47379df
move package common under replication
Poojita-Raj May 18, 2022
233acbc
rename to replication
Poojita-Raj May 18, 2022
50c4e6e
rename and doc changes
Poojita-Raj May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move package common under replication 
Signed-off-by: Poojita Raj <poojiraj@amazon.com>
  • Loading branch information
@Poojita-Raj
Poojita-Raj committed May 18, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 47379df615e6d798ca0bead82d81c425db04a0fc
2 changes: 1 addition & 1 deletion server/src/internalClusterTest/java/org/opensearch/gateway/RecoveryFromGatewayIT.java
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@
import org.opensearch.index.shard.ShardPath;
import org.opensearch.indices.IndicesService;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchIntegTestCase;
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
2 changes: 1 addition & 1 deletion server/src/internalClusterTest/java/org/opensearch/indices/recovery/IndexRecoveryIT.java
View file
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@
import org.opensearch.indices.IndicesService;
import org.opensearch.indices.NodeIndicesStats;
import org.opensearch.indices.analysis.AnalysisModule;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.indices.recovery.RecoveryState.Stage;
import org.opensearch.node.NodeClosedException;
import org.opensearch.node.RecoverySettingsChunkSizePlugin;
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@
import org.opensearch.index.mapper.MapperService;
import org.opensearch.index.seqno.SequenceNumbers;
import org.opensearch.index.shard.ShardId;
import org.opensearch.indices.common.ReplicationType;
import org.opensearch.indices.replication.common.ReplicationType;
import org.opensearch.rest.RestStatus;

import java.io.IOException;
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/index/IndexSettings.java
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@
import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.index.translog.Translog;
import org.opensearch.indices.common.ReplicationType;
import org.opensearch.indices.replication.common.ReplicationType;
import org.opensearch.ingest.IngestService;
import org.opensearch.node.Node;

2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/index/shard/StoreRecovery.java
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@
import org.opensearch.index.store.Store;
import org.opensearch.index.translog.Translog;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.Repository;

2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
View file
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@
import org.opensearch.indices.recovery.PeerRecoveryTargetService;
import org.opensearch.indices.recovery.RecoveryListener;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.common.ShardTargetState;
import org.opensearch.indices.replication.common.ShardTargetState;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.search.SearchService;
import org.opensearch.snapshots.SnapshotShardsService;
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/indices/recovery/MultiFileWriter.java
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
import org.opensearch.common.util.concurrent.ConcurrentCollections;
import org.opensearch.index.store.Store;
import org.opensearch.index.store.StoreFileMetadata;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.transport.Transports;

import java.io.IOException;
8 changes: 4 additions & 4 deletions server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java
View file
Original file line number Diff line number Diff line change
@@ -69,10 +69,10 @@
import org.opensearch.index.store.Store;
import org.opensearch.index.translog.Translog;
import org.opensearch.index.translog.TranslogCorruptedException;
import org.opensearch.indices.common.ShardTargetCollection;
import org.opensearch.indices.common.ShardTargetCollection.ShardTargetRef;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.common.ReplicationTimer;
import org.opensearch.indices.replication.common.ShardTargetCollection;
import org.opensearch.indices.replication.common.ShardTargetCollection.ShardTargetRef;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationTimer;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.ConnectTransportException;
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/indices/recovery/RecoveryListener.java
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@
import org.opensearch.OpenSearchException;
import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.indices.cluster.IndicesClusterStateService;
import org.opensearch.indices.common.ShardTargetListener;
import org.opensearch.indices.common.ShardTargetState;
import org.opensearch.indices.replication.common.ShardTargetListener;
import org.opensearch.indices.replication.common.ShardTargetState;

/**
* Listener that runs on changes in Recovery state
6 changes: 3 additions & 3 deletions server/src/main/java/org/opensearch/indices/recovery/RecoveryState.java
View file
Original file line number Diff line number Diff line change
@@ -45,9 +45,9 @@
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.index.shard.IndexShard;
import org.opensearch.index.shard.ShardId;
import org.opensearch.indices.common.ShardTargetState;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.common.ReplicationTimer;
import org.opensearch.indices.replication.common.ShardTargetState;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationTimer;

import java.io.IOException;
import java.util.Locale;
8 changes: 4 additions & 4 deletions server/src/main/java/org/opensearch/indices/recovery/RecoveryTarget.java
View file
Original file line number Diff line number Diff line change
@@ -55,10 +55,10 @@
import org.opensearch.index.store.Store;
import org.opensearch.index.store.StoreFileMetadata;
import org.opensearch.index.translog.Translog;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.common.ShardTarget;
import org.opensearch.indices.common.ShardTargetListener;
import org.opensearch.indices.common.ShardTargetCollection;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ShardTarget;
import org.opensearch.indices.replication.common.ShardTargetListener;
import org.opensearch.indices.replication.common.ShardTargetCollection;

import java.io.IOException;
import java.nio.file.Path;
2 changes: 1 addition & 1 deletion ...ndices/common/ReplicationLuceneIndex.java → ...cation/common/ReplicationLuceneIndex.java
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

import org.opensearch.common.Strings;
import org.opensearch.common.io.stream.StreamInput;
2 changes: 1 addition & 1 deletion ...ces/common/ReplicationRequestTracker.java → ...ion/common/ReplicationRequestTracker.java
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
* GitHub history for details.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

import org.opensearch.action.ActionListener;
import org.opensearch.common.Nullable;
2 changes: 1 addition & 1 deletion ...arch/indices/common/ReplicationTimer.java → .../replication/common/ReplicationTimer.java
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
2 changes: 1 addition & 1 deletion ...earch/indices/common/ReplicationType.java → ...s/replication/common/ReplicationType.java
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

/**
* Enumerates the types of replication strategies supported by OpenSearch.
2 changes: 1 addition & 1 deletion ...pensearch/indices/common/ShardTarget.java → ...dices/replication/common/ShardTarget.java
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

import org.apache.logging.log4j.Logger;
import org.opensearch.ExceptionsHelper;
2 changes: 1 addition & 1 deletion ...indices/common/ShardTargetCollection.java → ...ication/common/ShardTargetCollection.java
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
* GitHub history for details.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
2 changes: 1 addition & 1 deletion ...h/indices/common/ShardTargetListener.java → ...plication/common/ShardTargetListener.java
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

import org.opensearch.OpenSearchException;

2 changes: 1 addition & 1 deletion ...arch/indices/common/ShardTargetState.java → .../replication/common/ShardTargetState.java
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;

/**
* Represents a state object used to track copying of segments from an external source
2 changes: 1 addition & 1 deletion ...ensearch/indices/common/package-info.java → ...ices/replication/common/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@
*/

/** Foundation classes for Replication Implementation. */
package org.opensearch.indices.common;
package org.opensearch.indices.replication.common;
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/index/replication/RecoveryDuringReplicationTests.java
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@
import org.opensearch.index.translog.Translog;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.recovery.RecoveryTarget;
import org.opensearch.indices.common.ShardTargetListener;
import org.opensearch.indices.replication.common.ShardTargetListener;

import java.io.IOException;
import java.util.ArrayList;
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
View file
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@
import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.recovery.RecoveryTarget;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.repositories.IndexId;
import org.opensearch.snapshots.Snapshot;
import org.opensearch.snapshots.SnapshotId;
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/index/shard/StoreRecoveryTests.java
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@
import org.opensearch.index.mapper.IdFieldMapper;
import org.opensearch.index.mapper.Uid;
import org.opensearch.index.seqno.SequenceNumbers;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.test.OpenSearchTestCase;

import java.io.IOException;
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/indices/recovery/RecoverySourceHandlerTests.java
View file
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@
import org.opensearch.index.store.Store;
import org.opensearch.index.store.StoreFileMetadata;
import org.opensearch.index.translog.Translog;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.test.CorruptionUtils;
import org.opensearch.test.DummyShardLock;
import org.opensearch.test.IndexSettingsModule;
6 changes: 3 additions & 3 deletions server/src/test/java/org/opensearch/indices/recovery/RecoveryTargetTests.java
View file
Original file line number Diff line number Diff line change
@@ -41,12 +41,12 @@
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.index.shard.ShardId;
import org.opensearch.indices.common.ReplicationLuceneIndex.FileMetadata;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex.FileMetadata;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.indices.recovery.RecoveryState.Stage;
import org.opensearch.indices.recovery.RecoveryState.Translog;
import org.opensearch.indices.recovery.RecoveryState.VerifyIndex;
import org.opensearch.indices.common.ReplicationTimer;
import org.opensearch.indices.replication.common.ReplicationTimer;
import org.opensearch.test.OpenSearchTestCase;

import java.io.IOException;
4 changes: 2 additions & 2 deletions server/src/test/java/org/opensearch/indices/recovery/RecoveryTests.java
View file
Original file line number Diff line number Diff line change
@@ -69,8 +69,8 @@
import org.opensearch.index.store.Store;
import org.opensearch.index.translog.SnapshotMatchers;
import org.opensearch.index.translog.Translog;
import org.opensearch.indices.common.ShardTargetListener;
import org.opensearch.indices.common.ShardTargetState;
import org.opensearch.indices.replication.common.ShardTargetListener;
import org.opensearch.indices.replication.common.ShardTargetState;

import java.io.IOException;
import java.util.HashMap;
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/indices/recovery/ReplicationRequestTrackerTests.java
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
import org.opensearch.action.ActionListener;
import org.opensearch.action.support.PlainActionFuture;
import org.opensearch.common.util.concurrent.ConcurrentCollections;
import org.opensearch.indices.common.ReplicationRequestTracker;
import org.opensearch.indices.replication.common.ReplicationRequestTracker;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.threadpool.TestThreadPool;

6 changes: 3 additions & 3 deletions server/src/test/java/org/opensearch/recovery/RecoveriesCollectionTests.java
View file
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@
import org.opensearch.index.shard.IndexShard;
import org.opensearch.index.shard.ShardId;
import org.opensearch.index.store.Store;
import org.opensearch.indices.common.ShardTargetCollection;
import org.opensearch.indices.common.ShardTargetListener;
import org.opensearch.indices.common.ShardTargetState;
import org.opensearch.indices.replication.common.ShardTargetCollection;
import org.opensearch.indices.replication.common.ShardTargetListener;
import org.opensearch.indices.replication.common.ShardTargetState;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.recovery.RecoveryTarget;

2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@
import org.opensearch.index.store.Store;
import org.opensearch.indices.recovery.RecoverySettings;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
import org.opensearch.snapshots.Snapshot;
4 changes: 2 additions & 2 deletions server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java
View file
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@
import org.opensearch.index.Index;
import org.opensearch.index.shard.ShardId;
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.common.ReplicationLuceneIndex;
import org.opensearch.indices.common.ReplicationTimer;
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
import org.opensearch.indices.replication.common.ReplicationTimer;
import org.opensearch.test.OpenSearchTestCase;

import java.util.ArrayList;
4 changes: 2 additions & 2 deletions test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
View file
Original file line number Diff line number Diff line change
@@ -94,8 +94,8 @@
import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.indices.recovery.RecoveryTarget;
import org.opensearch.indices.recovery.StartRecoveryRequest;
import org.opensearch.indices.common.ShardTargetListener;
import org.opensearch.indices.common.ShardTargetState;
import org.opensearch.indices.replication.common.ShardTargetListener;
import org.opensearch.indices.replication.common.ShardTargetState;
import org.opensearch.repositories.IndexId;
import org.opensearch.repositories.Repository;
import org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase;