diff --git a/CHANGELOG.md b/CHANGELOG.md index b32e0a38d715f..ad1b8742e8461 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Add StoreFactory plugin interface for custom Store implementations([#19091](https://github.com/opensearch-project/OpenSearch/pull/19091)) - Use S3CrtClient for higher throughput while uploading files to S3 ([#18800](https://github.com/opensearch-project/OpenSearch/pull/18800)) - Add a dynamic setting to change skip_cache_factor and min_frequency for querycache ([#18351](https://github.com/opensearch-project/OpenSearch/issues/18351)) +- Add overload constructor for Translog to accept Channel Factory as a parameter ([#18918](https://github.com/opensearch-project/OpenSearch/pull/18918)) ### Changed - Add CompletionStage variants to methods in the Client Interface and default to ActionListener impl ([#18998](https://github.com/opensearch-project/OpenSearch/pull/18998)) diff --git a/server/src/main/java/org/opensearch/index/translog/InternalTranslogFactory.java b/server/src/main/java/org/opensearch/index/translog/InternalTranslogFactory.java index 6e2a7db0cfeb0..b17f217aa3bef 100644 --- a/server/src/main/java/org/opensearch/index/translog/InternalTranslogFactory.java +++ b/server/src/main/java/org/opensearch/index/translog/InternalTranslogFactory.java @@ -41,7 +41,8 @@ public Translog newTranslog( globalCheckpointSupplier, primaryTermSupplier, persistedSequenceNumberConsumer, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -64,7 +65,8 @@ public Translog newTranslog( globalCheckpointSupplier, primaryTermSupplier, persistedSequenceNumberConsumer, - translogOperationHelper + translogOperationHelper, + null ); } } diff --git a/server/src/main/java/org/opensearch/index/translog/LocalTranslog.java b/server/src/main/java/org/opensearch/index/translog/LocalTranslog.java index 6b45ccb867520..1c4b89be40fa1 100644 --- a/server/src/main/java/org/opensearch/index/translog/LocalTranslog.java +++ b/server/src/main/java/org/opensearch/index/translog/LocalTranslog.java @@ -50,7 +50,8 @@ public LocalTranslog( final LongSupplier globalCheckpointSupplier, final LongSupplier primaryTermSupplier, final LongConsumer persistedSequenceNumberConsumer, - final TranslogOperationHelper translogOperationHelper + final TranslogOperationHelper translogOperationHelper, + final ChannelFactory channelFactory ) throws IOException { super( config, @@ -59,7 +60,8 @@ public LocalTranslog( globalCheckpointSupplier, primaryTermSupplier, persistedSequenceNumberConsumer, - translogOperationHelper + translogOperationHelper, + channelFactory ); try { final Checkpoint checkpoint = readCheckpoint(location); @@ -113,6 +115,30 @@ public LocalTranslog( } } + /** + * Secondary constructor that does not accept ChannelFactory parameter. + */ + public LocalTranslog( + final TranslogConfig config, + final String translogUUID, + TranslogDeletionPolicy deletionPolicy, + final LongSupplier globalCheckpointSupplier, + final LongSupplier primaryTermSupplier, + final LongConsumer persistedSequenceNumberConsumer, + final TranslogOperationHelper translogOperationHelper + ) throws IOException { + this( + config, + translogUUID, + deletionPolicy, + globalCheckpointSupplier, + primaryTermSupplier, + persistedSequenceNumberConsumer, + translogOperationHelper, + null + ); + } + /** * Ensures that the given location has be synced / written to the underlying storage. * diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteBlobStoreInternalTranslogFactory.java b/server/src/main/java/org/opensearch/index/translog/RemoteBlobStoreInternalTranslogFactory.java index 63433a489cbab..1f2b2c48b471a 100644 --- a/server/src/main/java/org/opensearch/index/translog/RemoteBlobStoreInternalTranslogFactory.java +++ b/server/src/main/java/org/opensearch/index/translog/RemoteBlobStoreInternalTranslogFactory.java @@ -122,7 +122,8 @@ public Translog newTranslog( startedPrimarySupplier, remoteTranslogTransferTracker, remoteStoreSettings, - translogOperationHelper + translogOperationHelper, + null ); } } diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java index 920d26356bbb3..7fd915ba2c297 100644 --- a/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java +++ b/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java @@ -90,7 +90,8 @@ public RemoteFsTimestampAwareTranslog( startedPrimarySupplier, remoteTranslogTransferTracker, remoteStoreSettings, - translogOperationHelper + translogOperationHelper, + null ); logger = Loggers.getLogger(getClass(), shardId); this.metadataFilePinnedTimestampMap = new HashMap<>(); diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java index cda5085d750d0..bbe8b739e2da4 100644 --- a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java +++ b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java @@ -108,7 +108,8 @@ public RemoteFsTranslog( BooleanSupplier startedPrimarySupplier, RemoteTranslogTransferTracker remoteTranslogTransferTracker, RemoteStoreSettings remoteStoreSettings, - TranslogOperationHelper translogOperationHelper + TranslogOperationHelper translogOperationHelper, + ChannelFactory channelFactory ) throws IOException { super( config, @@ -117,7 +118,8 @@ public RemoteFsTranslog( globalCheckpointSupplier, primaryTermSupplier, persistedSequenceNumberConsumer, - translogOperationHelper + translogOperationHelper, + channelFactory ); logger = Loggers.getLogger(getClass(), shardId); this.startedPrimarySupplier = startedPrimarySupplier; diff --git a/server/src/main/java/org/opensearch/index/translog/Translog.java b/server/src/main/java/org/opensearch/index/translog/Translog.java index 1bd0120586ed3..7f949f85a64ab 100644 --- a/server/src/main/java/org/opensearch/index/translog/Translog.java +++ b/server/src/main/java/org/opensearch/index/translog/Translog.java @@ -154,6 +154,7 @@ public abstract class Translog extends AbstractIndexShardComponent implements In protected final TranslogDeletionPolicy deletionPolicy; protected final LongConsumer persistedSequenceNumberConsumer; protected final TranslogOperationHelper translogOperationHelper; + protected final ChannelFactory channelFactory; /** * Creates a new Translog instance. This method will create a new transaction log unless the given {@link TranslogGeneration} is @@ -182,7 +183,8 @@ public Translog( final LongSupplier globalCheckpointSupplier, final LongSupplier primaryTermSupplier, final LongConsumer persistedSequenceNumberConsumer, - final TranslogOperationHelper translogOperationHelper + final TranslogOperationHelper translogOperationHelper, + final ChannelFactory channelFactory ) throws IOException { super(config.getShardId(), config.getIndexSettings()); this.config = config; @@ -198,6 +200,31 @@ public Translog( this.location = config.getTranslogPath(); Files.createDirectories(this.location); this.translogOperationHelper = translogOperationHelper; + this.channelFactory = channelFactory != null ? channelFactory : FileChannel::open; + } + + /** + * Constructor that does not accept channelFactory parameter but accepts translogOperationHelper + */ + public Translog( + final TranslogConfig config, + final String translogUUID, + TranslogDeletionPolicy deletionPolicy, + final LongSupplier globalCheckpointSupplier, + final LongSupplier primaryTermSupplier, + final LongConsumer persistedSequenceNumberConsumer, + final TranslogOperationHelper translogOperationHelper + ) throws IOException { + this( + config, + translogUUID, + deletionPolicy, + globalCheckpointSupplier, + primaryTermSupplier, + persistedSequenceNumberConsumer, + translogOperationHelper, + null + ); } /** @@ -218,7 +245,8 @@ public Translog( globalCheckpointSupplier, primaryTermSupplier, persistedSequenceNumberConsumer, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + FileChannel::open ); assert config.getIndexSettings().isDerivedSourceEnabled() == false; // For derived source supported index, it is incorrect to use // this constructor @@ -324,7 +352,7 @@ protected void copyCheckpointTo(Path targetPath) throws IOException { } TranslogReader openReader(Path path, Checkpoint checkpoint) throws IOException { - FileChannel channel = FileChannel.open(path, StandardOpenOption.READ); + FileChannel channel = getChannelFactory().open(path, StandardOpenOption.READ); try { assert Translog.parseIdFromFileName(path) == checkpoint.generation : "expected generation: " + Translog.parseIdFromFileName(path) @@ -1931,7 +1959,7 @@ protected void ensureOpen() { } ChannelFactory getChannelFactory() { - return FileChannel::open; + return this.channelFactory; } /** diff --git a/server/src/main/java/org/opensearch/index/translog/TruncateTranslogAction.java b/server/src/main/java/org/opensearch/index/translog/TruncateTranslogAction.java index 2e515cb72fd9f..eb592822c17a4 100644 --- a/server/src/main/java/org/opensearch/index/translog/TruncateTranslogAction.java +++ b/server/src/main/java/org/opensearch/index/translog/TruncateTranslogAction.java @@ -222,7 +222,8 @@ public long minTranslogGenRequired(List readers, TranslogWriter () -> translogGlobalCheckpoint, () -> primaryTerm, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); Translog.Snapshot snapshot = translog.newSnapshot(0, Long.MAX_VALUE) ) { diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java index d004d5aa90eac..bb5a1eb568108 100644 --- a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java @@ -4182,7 +4182,8 @@ public void testRecoverFromForeignTranslog() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); translog.add(new Translog.Index("SomeBogusId", 0, primaryTerm.get(), "{}".getBytes(Charset.forName("UTF-8")))); assertEquals(generation.translogFileGeneration, translog.currentFileGeneration()); diff --git a/server/src/test/java/org/opensearch/index/translog/LocalTranslogTests.java b/server/src/test/java/org/opensearch/index/translog/LocalTranslogTests.java index 4c9bc2ae622ba..d61b63e6ff53b 100644 --- a/server/src/test/java/org/opensearch/index/translog/LocalTranslogTests.java +++ b/server/src/test/java/org/opensearch/index/translog/LocalTranslogTests.java @@ -223,7 +223,8 @@ protected Translog createTranslog(TranslogConfig config) throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, getPersistedSeqNoConsumer(), - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -235,7 +236,8 @@ protected Translog openTranslog(TranslogConfig config, String translogUUID) thro () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, getPersistedSeqNoConsumer(), - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -272,7 +274,8 @@ private Translog create(Path path) throws IOException { () -> globalCheckpoint.get(), primaryTerm::get, getPersistedSeqNoConsumer(), - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -1508,13 +1511,9 @@ public int write(ByteBuffer src) throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, persistedSeqNos::add, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + channelFactory + ) ) { TranslogWriter writer = translog.getCurrent(); int initialWriteCalls = writeCalls.get(); @@ -1614,13 +1613,9 @@ public void force(boolean metaData) throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, persistedSeqNos::add, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + channelFactory + ) ) { TranslogWriter writer = translog.getCurrent(); byte[] bytes = new byte[256]; @@ -1712,13 +1707,9 @@ public void force(boolean metaData) throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, persistedSeqNos::add, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + channelFactory + ) ) { TranslogWriter writer = translog.getCurrent(); @@ -1819,7 +1810,8 @@ public void testBasicRecovery() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); assertEquals( "lastCommitted must be 1 less than current", @@ -1879,7 +1871,8 @@ public void testRecoveryUncommitted() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertNotNull(translogGeneration); @@ -1907,7 +1900,8 @@ public void testRecoveryUncommitted() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertNotNull(translogGeneration); @@ -1970,7 +1964,8 @@ public void testRecoveryUncommittedFileExists() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertNotNull(translogGeneration); @@ -1999,7 +1994,8 @@ public void testRecoveryUncommittedFileExists() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertNotNull(translogGeneration); @@ -2064,7 +2060,8 @@ public void testRecoveryUncommittedCorruptedCheckpoint() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ); assertThat( @@ -2091,7 +2088,8 @@ public void testRecoveryUncommittedCorruptedCheckpoint() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertNotNull(translogGeneration); @@ -2390,7 +2388,8 @@ public void testOpenForeignTranslog() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); fail("translog doesn't belong to this UUID"); } catch (TranslogCorruptedException ex) { @@ -2403,7 +2402,8 @@ public void testOpenForeignTranslog() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); try (Translog.Snapshot snapshot = this.translog.newSnapshot(randomLongBetween(0, firstUncommitted), Long.MAX_VALUE)) { for (int i = firstUncommitted; i < translogOperations; i++) { @@ -2634,7 +2634,8 @@ public void testFailFlush() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertEquals( @@ -2792,7 +2793,8 @@ protected void afterAdd() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); Translog.Snapshot snapshot = tlog.newSnapshot() ) { @@ -2856,7 +2858,8 @@ public void testRecoveryFromAFutureGenerationCleansUp() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); assertThat(translog.getMinFileGeneration(), equalTo(1L)); // no trimming done yet, just recovered @@ -2926,7 +2929,8 @@ public void testRecoveryFromFailureOnTrimming() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { // we don't know when things broke exactly @@ -3003,13 +3007,9 @@ private Translog getFailableTranslog( () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + channelFactory ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - @Override void deleteReaderFiles(TranslogReader reader) { if (fail.fail()) { @@ -3151,7 +3151,8 @@ public void testFailWhileCreateWriteWithRecoveredTLogs() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) { @Override protected TranslogWriter createWriter( @@ -3220,7 +3221,8 @@ public void testRecoverWithUnbackedNextGenInIllegalState() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ); assertEquals(ex.getMessage(), "failed to create new translog file"); @@ -3248,7 +3250,8 @@ public void testRecoverWithUnbackedNextGenAndFutureFile() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { assertFalse(tlog.syncNeeded()); @@ -3271,7 +3274,8 @@ public void testRecoverWithUnbackedNextGenAndFutureFile() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ); assertEquals(ex.getMessage(), "failed to create new translog file"); @@ -3402,7 +3406,8 @@ public void testWithRandomException() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); Translog.Snapshot snapshot = translog.newSnapshot(localCheckpointOfSafeCommit + 1, Long.MAX_VALUE) ) { @@ -3498,7 +3503,8 @@ public void testPendingDelete() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); translog.add(new Translog.Index("2", 1, primaryTerm.get(), new byte[] { 2 })); translog.rollGeneration(); @@ -3513,7 +3519,8 @@ public void testPendingDelete() throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -3881,7 +3888,8 @@ class MisbehavingTranslog extends LocalTranslog { globalCheckpointSupplier, primaryTermSupplier, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -3989,7 +3997,8 @@ public void copy(Path source, Path target, CopyOption... options) throws IOExcep () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { recoveredTranslog.rollGeneration(); @@ -4024,7 +4033,8 @@ public void testSyncConcurrently() throws Exception { globalCheckpointSupplier, primaryTerm::get, persistedSeqNos::add, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ) ) { Thread[] threads = new Thread[between(2, 8)]; @@ -4106,13 +4116,9 @@ public void force(boolean metaData) throws IOException { () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + channelFactory ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - @Override void syncBeforeRollGeneration() { // make it a noop like the old versions diff --git a/server/src/test/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslogTests.java b/server/src/test/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslogTests.java index 9682c0ba45a06..6c89cf2adf988 100644 --- a/server/src/test/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslogTests.java +++ b/server/src/test/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslogTests.java @@ -621,13 +621,9 @@ public void testExtraGenToKeep() throws Exception { () -> Boolean.TRUE, new RemoteTranslogTransferTracker(shardId, 10), DefaultRemoteStoreSettings.INSTANCE, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + channelFactory + ) ) { addToTranslogAndListAndUpload(translog, ops, new Translog.Index("1", 0, primaryTerm.get(), new byte[] { 1 })); addToTranslogAndListAndUpload(translog, ops, new Translog.Index("2", 1, primaryTerm.get(), new byte[] { 1 })); diff --git a/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java b/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java index 7da3bba9448a4..edcdca3f7b3de 100644 --- a/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java +++ b/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java @@ -201,7 +201,8 @@ protected RemoteFsTranslog createTranslogInstance( primaryMode::get, new RemoteTranslogTransferTracker(shardId, 10), DefaultRemoteStoreSettings.INSTANCE, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } @@ -475,13 +476,9 @@ public void testExtraGenToKeep() throws Exception { () -> Boolean.TRUE, new RemoteTranslogTransferTracker(shardId, 10), DefaultRemoteStoreSettings.INSTANCE, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + null + ) ) { addToTranslogAndListAndUpload(translog, ops, new Translog.Index("1", 0, primaryTerm.get(), new byte[] { 1 })); @@ -1525,13 +1522,9 @@ public void testTranslogWriterCanFlushInAddOrReadCall() throws IOException { () -> Boolean.TRUE, new RemoteTranslogTransferTracker(shardId, 10), DefaultRemoteStoreSettings.INSTANCE, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + channelFactory + ) ) { TranslogWriter writer = translog.getCurrent(); int initialWriteCalls = writeCalls.get(); @@ -1636,13 +1629,9 @@ public void force(boolean metaData) throws IOException { () -> Boolean.TRUE, new RemoteTranslogTransferTracker(shardId, 10), DefaultRemoteStoreSettings.INSTANCE, - TranslogOperationHelper.DEFAULT - ) { - @Override - ChannelFactory getChannelFactory() { - return channelFactory; - } - } + TranslogOperationHelper.DEFAULT, + channelFactory + ) ) { TranslogWriter writer = translog.getCurrent(); byte[] bytes = new byte[256]; diff --git a/server/src/test/java/org/opensearch/index/translog/TranslogManagerTestCase.java b/server/src/test/java/org/opensearch/index/translog/TranslogManagerTestCase.java index 22aa2e88e665f..10529bb155845 100644 --- a/server/src/test/java/org/opensearch/index/translog/TranslogManagerTestCase.java +++ b/server/src/test/java/org/opensearch/index/translog/TranslogManagerTestCase.java @@ -95,7 +95,8 @@ protected Translog createTranslog(Path translogPath, LongSupplier primaryTermSup () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTermSupplier, seqNo -> {}, - TranslogOperationHelper.DEFAULT + TranslogOperationHelper.DEFAULT, + null ); } diff --git a/test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java b/test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java index 9e8c3239f5197..fe6e38e1b3e48 100644 --- a/test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java @@ -553,7 +553,8 @@ protected Translog createTranslog(Path translogPath, LongSupplier primaryTermSup () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTermSupplier, seqNo -> {}, - TranslogOperationHelper.create(engine.config()) + TranslogOperationHelper.create(engine.config()), + null ); }