Skip to content
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

Make Recovery API support detailed params #29076

Merged
merged 7 commits into from
Jun 21, 2019
Merged

Make Recovery API support detailed params #29076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
32d5069
Make recovery API support only `detailed` params
PnPie Mar 17, 2019
279afac
Merge branch 'master' into recovery_param
PnPie Mar 17, 2019
a5b72c4
update and add rest layer test
PnPie Apr 6, 2019
e50cc7b
restore changes for Strings.java
PnPie Apr 6, 2019
c7eea32
Merge remote-tracking branch 'elastic/master' into pr/29076
ywelsch Jun 20, 2019
8707e88
Fix docs recovery test
ywelsch Jun 20, 2019
1ba84cf
Add BWC conditon for newly added test
ywelsch Jun 20, 2019
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
2 changes: 1 addition & 1 deletion docs/reference/indices/recovery.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Response:
}
--------------------------------------------------
// TESTRESPONSE[s/"source" : \{[^}]*\}/"source" : $body.$_path/]
// TESTRESPONSE[s/"details" : \[[^\]]*\]//]
// TESTRESPONSE[s/"details" : \[[^\]]*\]/"details" : $body.$_path/]
// TESTRESPONSE[s/: (\-)?[0-9]+/: $body.$_path/]
// TESTRESPONSE[s/: "[^"]*"/: $body.$_path/]
////
Expand Down
25 changes: 25 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,28 @@
index: [v*]

- match: { $body: {} }
---
"Indices recovery test with detailed parameter":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we will have to skip this test for versions that don't have this fix.

- skip:
version: " - 7.9.99"
reason: bug with detailed parameter fixed in 8.0

- do:
indices.create:
index: test_3
body:
settings:
index:
number_of_replicas: 0

- do:
cluster.health:
wait_for_status: green

- do:
indices.recovery:
index: [test_3]
human: true
detailed: true

- match: { test_3.shards.0.index.files.details: [] }
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ public synchronized XContentBuilder toXContent(XContentBuilder builder, Params p
builder.field(Fields.REUSED, reusedFileCount());
builder.field(Fields.RECOVERED, recoveredFileCount());
builder.field(Fields.PERCENT, String.format(Locale.ROOT, "%1.1f%%", recoveredFilesPercent()));
if (params.paramAsBoolean("details", false)) {
if (params.paramAsBoolean("detailed", false)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only change that we need to do in this class

builder.startArray(Fields.DETAILS);
for (File file : fileDetails.values()) {
file.toXContent(builder, params);
Expand Down