Skip to content

Commit 6eeccd8

Browse files
authored
Fix NPE on Stale Index in IndicesService (#39174)
This is a backport of #38891 which closes #38845
1 parent 32f7780 commit 6eeccd8

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

server/src/main/java/org/elasticsearch/indices/IndicesService.java

+3
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,9 @@ public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState
900900
final IndexMetaData metaData;
901901
try {
902902
metaData = metaStateService.loadIndexState(index);
903+
if (metaData == null) {
904+
return null;
905+
}
903906
} catch (Exception e) {
904907
logger.warn(() -> new ParameterizedMessage("[{}] failed to load state file from a stale deleted index, " +
905908
"folders will be left on disk", index), e);

0 commit comments

Comments
 (0)