github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Pass checkpoint to commit extra user data function (#122930)

Browse source 
Relates ES-10852
This commit is contained in:
Iraklis Psaroudakis 2025-02-19 16:12:50 +02:00 • committed by GitHub
parent 04422cdc7f
commit ad220c1abb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
View file

@ -2925,7 +2925,7 @@ public class InternalEngine extends Engine {
* {@link IndexWriter#commit()} call flushes all documents, we defer computation of the maximum sequence number to the time * {@link IndexWriter#commit()} call flushes all documents, we defer computation of the maximum sequence number to the time
* of invocation of the commit data iterator (which occurs after all documents have been flushed to Lucene). * of invocation of the commit data iterator (which occurs after all documents have been flushed to Lucene).
*/ */
final Map<String, String> extraCommitUserData = getCommitExtraUserData(); final Map<String, String> extraCommitUserData = getCommitExtraUserData(localCheckpoint);
final Map<String, String> commitData = Maps.newMapWithExpectedSize(8 + extraCommitUserData.size()); final Map<String, String> commitData = Maps.newMapWithExpectedSize(8 + extraCommitUserData.size());
commitData.putAll(extraCommitUserData); commitData.putAll(extraCommitUserData);
commitData.put(Translog.TRANSLOG_UUID_KEY, translog.getTranslogUUID()); commitData.put(Translog.TRANSLOG_UUID_KEY, translog.getTranslogUUID());
@ -2973,8 +2973,10 @@ public class InternalEngine extends Engine {
/** /**
* Allows InternalEngine extenders to return custom key-value pairs which will be included in the Lucene commit user-data. Custom user * Allows InternalEngine extenders to return custom key-value pairs which will be included in the Lucene commit user-data. Custom user
* data keys can be overwritten by if their keys conflict keys used by InternalEngine. * data keys can be overwritten by if their keys conflict keys used by InternalEngine.
*
* @param localCheckpoint the local checkpoint of the commit
*/ */
protected Map<String, String> getCommitExtraUserData() { protected Map<String, String> getCommitExtraUserData(final long localCheckpoint) {
return Collections.emptyMap(); return Collections.emptyMap();
} }

2
server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View file

@ -7327,7 +7327,7 @@ public class InternalEngineTests extends EngineTestCase {
engine.close(); engine.close();
engine = new InternalEngine(engine.config()) { engine = new InternalEngine(engine.config()) {
@Override @Override
protected Map<String, String> getCommitExtraUserData() { protected Map<String, String> getCommitExtraUserData(final long localCheckpoint) {
return Map.of("userkey", "userdata", ES_VERSION, IndexVersions.ZERO.toString()); return Map.of("userkey", "userdata", ES_VERSION, IndexVersions.ZERO.toString());
} }
}; };