Skip to content

Commit eeeab29

Browse files
committed
Added logger (associated with shard) to CodecServiceConfig
Signed-off-by: Andriy Redko <[email protected]>
1 parent 5c136be commit eeeab29

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

server/src/main/java/org/opensearch/index/codec/CodecServiceConfig.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.index.codec;
1010

11+
import org.apache.logging.log4j.Logger;
1112
import org.opensearch.common.Nullable;
1213
import org.opensearch.index.IndexSettings;
1314
import org.opensearch.index.mapper.MapperService;
@@ -20,10 +21,12 @@
2021
public final class CodecServiceConfig {
2122
private final IndexSettings indexSettings;
2223
private final MapperService mapperService;
24+
private final Logger logger;
2325

24-
public CodecServiceConfig(IndexSettings indexSettings, @Nullable MapperService mapperService) {
26+
public CodecServiceConfig(IndexSettings indexSettings, @Nullable MapperService mapperService, Logger logger) {
2527
this.indexSettings = Objects.requireNonNull(indexSettings);
2628
this.mapperService = mapperService;
29+
this.logger = logger;
2730
}
2831

2932
public IndexSettings getIndexSettings() {
@@ -34,4 +37,8 @@ public IndexSettings getIndexSettings() {
3437
public MapperService getMapperService() {
3538
return mapperService;
3639
}
40+
41+
public Logger getLogger() {
42+
return logger;
43+
}
3744
}

server/src/main/java/org/opensearch/index/engine/EngineConfigFactory.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.index.engine;
1010

11+
import org.apache.logging.log4j.Logger;
1112
import org.apache.lucene.analysis.Analyzer;
1213
import org.apache.lucene.index.MergePolicy;
1314
import org.apache.lucene.search.QueryCache;
@@ -169,7 +170,8 @@ public EngineConfig newEngineConfig(
169170
retentionLeasesSupplier,
170171
primaryTermSupplier,
171172
tombstoneDocSupplier,
172-
null
173+
null, /* mapperService */
174+
null /* logger */
173175
);
174176
}
175177

@@ -197,7 +199,8 @@ public EngineConfig newEngineConfig(
197199
Supplier<RetentionLeases> retentionLeasesSupplier,
198200
LongSupplier primaryTermSupplier,
199201
EngineConfig.TombstoneDocSupplier tombstoneDocSupplier,
200-
MapperService mapperService
202+
MapperService mapperService,
203+
Logger logger
201204
) {
202205

203206
return new EngineConfig(
@@ -210,7 +213,7 @@ public EngineConfig newEngineConfig(
210213
analyzer,
211214
similarity,
212215
this.codecServiceFactory != null
213-
? this.codecServiceFactory.createCodecService(new CodecServiceConfig(indexSettings, mapperService))
216+
? this.codecServiceFactory.createCodecService(new CodecServiceConfig(indexSettings, mapperService, logger))
214217
: codecService,
215218
eventListener,
216219
queryCache,

server/src/main/java/org/opensearch/index/shard/IndexShard.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3178,7 +3178,8 @@ private EngineConfig newEngineConfig(LongSupplier globalCheckpointSupplier) {
31783178
replicationTracker::getRetentionLeases,
31793179
() -> getOperationPrimaryTerm(),
31803180
tombstoneDocSupplier(),
3181-
mapperService
3181+
mapperService,
3182+
logger
31823183
);
31833184
}
31843185

0 commit comments

Comments
 (0)