Skip to content

Commit

Permalink
Make Recovery API support detailed params (#29076)
Browse files Browse the repository at this point in the history
Properly forwards the `detailed` parameter to show the recovery stats details.

Closes #28910
  • Loading branch information
PnPie authored and ywelsch committed Jun 21, 2019
1 parent 90e151e commit c88f2f2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/reference/indices/recovery.asciidoc
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
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":
- skip:
version: " - 7.2.99"
reason: bug with detailed parameter fixed in 7.3

- 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: [] }
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,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)) {
builder.startArray(Fields.DETAILS);
for (File file : fileDetails.values()) {
file.toXContent(builder, params);
Expand Down

0 comments on commit c88f2f2

Please sign in to comment.