Skip to content

Commit 79a1c4d

Browse files
committed
Protect against deleted projects
1 parent 5f4128e commit 79a1c4d

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -880,11 +880,8 @@ private Index maybeExecuteRollover(ProjectMetadata project, DataStream dataStrea
880880
),
881881
e
882882
);
883-
DataStream latestDataStream = clusterService.state()
884-
.metadata()
885-
.getProject(project.id())
886-
.dataStreams()
887-
.get(dataStream.getName());
883+
ProjectMetadata latestProject = clusterService.state().metadata().projects().get(project.id());
884+
DataStream latestDataStream = latestProject == null ? null : latestProject.dataStreams().get(dataStream.getName());
888885
if (latestDataStream != null) {
889886
if (latestDataStream.getWriteIndex().getName().equals(currentRunWriteIndex.getName())) {
890887
// data stream has not been rolled over in the meantime so record the error against the write index we
@@ -1081,11 +1078,8 @@ public void onResponse(RolloverResponse rolloverResponse) {
10811078

10821079
@Override
10831080
public void onFailure(Exception e) {
1084-
DataStream dataStream = clusterService.state()
1085-
.metadata()
1086-
.getProject(projectId)
1087-
.dataStreams()
1088-
.get(resolvedRolloverTarget.resource());
1081+
ProjectMetadata latestProject = clusterService.state().metadata().projects().get(projectId);
1082+
DataStream dataStream = latestProject == null ? null : latestProject.dataStreams().get(resolvedRolloverTarget.resource());
10891083
if (dataStream == null || dataStream.getWriteIndex().getName().equals(writeIndexName) == false) {
10901084
// the data stream has another write index so no point in recording an error for the previous write index we were
10911085
// attempting to roll over

0 commit comments

Comments
 (0)