Skip to content

Fix NPE in rolling over unknown target and return 404 #125352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 22, 2025
Merged

Fix NPE in rolling over unknown target and return 404 #125352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5c13399
Fix NPE in rolling over unknown target
nielsbauman Mar 20, 2025
1bf5dde
Merge branch 'main' into fix-rollover-not-found
nielsbauman Mar 21, 2025
9135578
Return 404 instead of 400
nielsbauman Mar 21, 2025
24ddc07
Remove unused parameter
nielsbauman Mar 21, 2025
bf35059
[CI] Auto commit changes from spotless
Mar 21, 2025
99e9ada
Add test capability
nielsbauman Mar 21, 2025
767b894
Fix test
nielsbauman Mar 21, 2025
72f92f5
Merge branch 'main' into fix-rollover-not-found
nielsbauman Mar 21, 2025
08d520f
Update docs/changelog/125352.yaml
nielsbauman Mar 22, 2025
bb8ace1
Merge branch 'main' into fix-rollover-not-found
nielsbauman Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,11 @@
min_age: "0s"
min_docs: 1
- match: { error.reason: "Validation Failed: 1: at least one max_* rollover condition must be set when using min_* conditions;" }

---
"Rolling over an unknown target should return 404":
- do:
catch: bad_request
indices.rollover:
alias: "non_existent"
- match: {error.reason: "rollover target [non_existent] does not exist"}
2 changes: 1 addition & 1 deletion ...rc/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected ClusterBlockException checkBlock(RolloverRequest request, ClusterState
ResolvedExpression resolvedRolloverTarget = SelectorResolver.parseExpression(request.getRolloverTarget(), request.indicesOptions());
final IndexAbstraction indexAbstraction = projectMetadata.getIndicesLookup().get(resolvedRolloverTarget.resource());
final String[] indicesToCheck;
if (indexAbstraction.getType().equals(IndexAbstraction.Type.DATA_STREAM)) {
if (indexAbstraction != null && indexAbstraction.getType().equals(IndexAbstraction.Type.DATA_STREAM)) {
DataStream dataStream = (DataStream) indexAbstraction;
boolean targetFailureStore = resolvedRolloverTarget.selector() != null
&& resolvedRolloverTarget.selector().shouldIncludeFailures();
Expand Down