Include elastic#134006

Author: dnhatn

server/src/main/java/org/elasticsearch/index/codec/PerFieldFormatSupplier.java

@@ -27,6 +27,7 @@
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
+import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.index.mapper.TimeSeriesIdFieldMapper;
 import org.elasticsearch.index.mapper.TimeSeriesRoutingHashFieldMapper;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
@@ -48,12 +49,17 @@ public class PerFieldFormatSupplier {
         // TODO: should we just allow all fields to use tsdb doc values codec?
         // Avoid using tsdb codec for fields like _seq_no, _primary_term.
         // But _tsid and _ts_routing_hash should always use the tsdb codec.
-        Set<String> includeMetaField = new HashSet<>(3);
+        Set<String> includeMetaField = new HashSet<>(5);
         includeMetaField.add(TimeSeriesIdFieldMapper.NAME);
         includeMetaField.add(TimeSeriesRoutingHashFieldMapper.NAME);
         if (SEQNO_FIELD_USE_TSDB_DOC_VALUES_FORMAT.isEnabled()) {
             includeMetaField.add(SeqNoFieldMapper.NAME);
         }
+
+        // Values of these doc_values fields can be filtered out in RecoverySourcePruneMergePolicy,
+        // which leads to inconsistencies between merge stats and actual values.
+        includeMetaField.add(SourceFieldMapper.RECOVERY_SOURCE_NAME);
+        includeMetaField.add(SourceFieldMapper.RECOVERY_SOURCE_SIZE_NAME);
         INCLUDE_META_FIELDS = Collections.unmodifiableSet(includeMetaField);
     }
 

server/src/test/java/org/elasticsearch/index/codec/PerFieldMapperCodecTests.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.index.codec.postings.ES812PostingsFormat;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
+import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.index.mapper.TimeSeriesIdFieldMapper;
 import org.elasticsearch.index.mapper.TimeSeriesRoutingHashFieldMapper;
 import org.elasticsearch.test.ESTestCase;
@@ -208,6 +209,8 @@ public void testMetaFields() throws IOException {
         PerFieldFormatSupplier perFieldMapperCodec = createFormatSupplier(true, IndexMode.LOGSDB, MAPPING_3);
         assertThat((perFieldMapperCodec.useTSDBDocValuesFormat(TimeSeriesIdFieldMapper.NAME)), is(true));
         assertThat((perFieldMapperCodec.useTSDBDocValuesFormat(TimeSeriesRoutingHashFieldMapper.NAME)), is(true));
+        assertThat((perFieldMapperCodec.useTSDBDocValuesFormat(SourceFieldMapper.RECOVERY_SOURCE_NAME)), is(true));
+        assertThat((perFieldMapperCodec.useTSDBDocValuesFormat(SourceFieldMapper.RECOVERY_SOURCE_SIZE_NAME)), is(true));
     }
 
     public void testSeqnoField() throws IOException {