Skip to content

Commit d10fa1c

Browse files
Fix NPE on Stale Index in IndicesService (#38891)
* Closes #38845
1 parent 5f2ddf2 commit d10fa1c

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
@@ -874,6 +874,9 @@ public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState
874874
final IndexMetaData metaData;
875875
try {
876876
metaData = metaStateService.loadIndexState(index);
877+
if (metaData == null) {
878+
return null;
879+
}
877880
} catch (Exception e) {
878881
logger.warn(() -> new ParameterizedMessage("[{}] failed to load state file from a stale deleted index, " +
879882
"folders will be left on disk", index), e);

0 commit comments

Comments
 (0)