Skip to content

Commit b269a77

Browse files
authored
Remove ensureIndexHasHistoryUUID (#47043)
We no longer use this method in production code.
1 parent f3420af commit b269a77

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

server/src/main/java/org/elasticsearch/index/store/Store.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,22 +1484,6 @@ public void associateIndexWithNewTranslog(final String translogUUID) throws IOEx
14841484
}
14851485
}
14861486

1487-
1488-
/**
1489-
* Checks that the Lucene index contains a history uuid marker. If not, a new one is generated and committed.
1490-
*/
1491-
public void ensureIndexHasHistoryUUID() throws IOException {
1492-
metadataLock.writeLock().lock();
1493-
try (IndexWriter writer = newAppendingIndexWriter(directory, null)) {
1494-
final Map<String, String> userData = getUserData(writer);
1495-
if (userData.containsKey(Engine.HISTORY_UUID_KEY) == false) {
1496-
updateCommitData(writer, Collections.singletonMap(Engine.HISTORY_UUID_KEY, UUIDs.randomBase64UUID()));
1497-
}
1498-
} finally {
1499-
metadataLock.writeLock().unlock();
1500-
}
1501-
}
1502-
15031487
/**
15041488
* Keeping existing unsafe commits when opening an engine can be problematic because these commits are not safe
15051489
* at the recovering time but they can suddenly become safe in the future.

server/src/test/java/org/elasticsearch/index/store/StoreTests.java

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,38 +1029,6 @@ public void testCanReadOldCorruptionMarker() throws IOException {
10291029
store.close();
10301030
}
10311031

1032-
public void testEnsureIndexHasHistoryUUID() throws IOException {
1033-
final ShardId shardId = new ShardId("index", "_na_", 1);
1034-
try (Store store = new Store(shardId, INDEX_SETTINGS, StoreTests.newDirectory(random()), new DummyShardLock(shardId))) {
1035-
1036-
store.createEmpty(Version.LATEST);
1037-
1038-
// remove the history uuid
1039-
IndexWriterConfig iwc = new IndexWriterConfig(null)
1040-
.setCommitOnClose(false)
1041-
// we don't want merges to happen here - we call maybe merge on the engine
1042-
// later once we stared it up otherwise we would need to wait for it here
1043-
// we also don't specify a codec here and merges should use the engines for this index
1044-
.setMergePolicy(NoMergePolicy.INSTANCE)
1045-
.setOpenMode(IndexWriterConfig.OpenMode.APPEND);
1046-
try (IndexWriter writer = new IndexWriter(store.directory(), iwc)) {
1047-
Map<String, String> newCommitData = new HashMap<>();
1048-
for (Map.Entry<String, String> entry : writer.getLiveCommitData()) {
1049-
if (entry.getKey().equals(Engine.HISTORY_UUID_KEY) == false) {
1050-
newCommitData.put(entry.getKey(), entry.getValue());
1051-
}
1052-
}
1053-
writer.setLiveCommitData(newCommitData.entrySet());
1054-
writer.commit();
1055-
}
1056-
1057-
store.ensureIndexHasHistoryUUID();
1058-
1059-
SegmentInfos segmentInfos = Lucene.readSegmentInfos(store.directory());
1060-
assertThat(segmentInfos.getUserData(), hasKey(Engine.HISTORY_UUID_KEY));
1061-
}
1062-
}
1063-
10641032
public void testHistoryUUIDCanBeForced() throws IOException {
10651033
final ShardId shardId = new ShardId("index", "_na_", 1);
10661034
try (Store store = new Store(shardId, INDEX_SETTINGS, StoreTests.newDirectory(random()), new DummyShardLock(shardId))) {

0 commit comments

Comments
 (0)