Skip to content

Commit c276f6d

Browse files
authored
Remove TODOs from MetaStateService (#52646)
7.x nodes permit the on-disk cluster metadata to omit the manifest file in order to support upgrades from 6.x. We are similarly lenient in `master`, i.e. 8.x, but there is no need to be since we must be upgrading from a 7.x node which ensures that the manifest file is written. We prefer to keep this lenience (see #52412) so this commit removes the commented-out indications that it should be removed. The new metadata format introduced in #50907 means that this whole subsystem will be removed in v9 anyway. Relates #38556
1 parent c1a1047 commit c276f6d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

server/src/main/java/org/elasticsearch/gateway/MetaStateService.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ private Tuple<Manifest, MetaData> loadFullStateBWC() throws IOException {
120120
if (globalMetaData != null) {
121121
metaDataBuilder = MetaData.builder(globalMetaData);
122122
indexGraveyard = globalMetaData.custom(IndexGraveyard.TYPE);
123-
// TODO https://github.com/elastic/elasticsearch/issues/38556
124-
// assert Version.CURRENT.major < 8 : "failed to find manifest file, which is mandatory staring with Elasticsearch version 8.0";
125123
} else {
126124
metaDataBuilder = MetaData.builder();
127125
indexGraveyard = IndexGraveyard.builder().build();
@@ -131,8 +129,6 @@ private Tuple<Manifest, MetaData> loadFullStateBWC() throws IOException {
131129
Tuple<IndexMetaData, Long> indexMetaDataAndGeneration =
132130
INDEX_META_DATA_FORMAT.loadLatestStateWithGeneration(logger, namedXContentRegistry,
133131
nodeEnv.resolveIndexFolder(indexFolderName));
134-
// TODO https://github.com/elastic/elasticsearch/issues/38556
135-
// assert Version.CURRENT.major < 8 : "failed to find manifest file, which is mandatory staring with Elasticsearch version 8.0";
136132
IndexMetaData indexMetaData = indexMetaDataAndGeneration.v1();
137133
long generation = indexMetaDataAndGeneration.v2();
138134
if (indexMetaData != null) {

0 commit comments

Comments
 (0)