Improve Close Index Response#39687
Merged
dnhatn merged 11 commits intoelastic:masterfrom May 23, 2019
Merged
Conversation
Collaborator
|
Pinging @elastic/es-distributed |
ywelsch
approved these changes
Apr 30, 2019
Contributor
ywelsch
left a comment
There was a problem hiding this comment.
Looking good. Can @henningandersen give this a look as well? Thank you
Contributor
henningandersen
left a comment
There was a problem hiding this comment.
Thanks @dnhatn , I left a few comments, my primary concern is the comment on handling when closeRoutingTable skips indices.
server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
Outdated
Show resolved
Hide resolved
| .map(result -> result.getKey().getName()) | ||
| .filter(index -> newState.routingTable().hasIndex(index)) | ||
| final List<IndexResult> indices = new ArrayList<>(results.values()); | ||
| final boolean acknowledged = indices.stream().noneMatch(IndexResult::hasFailures); |
Contributor
There was a problem hiding this comment.
In closeRoutingTable, we check for:
currentState.blocks().hasIndexBlock(index.getName(), closingBlock) == false
I think this will not be matched anymore by this acknowledged check, meaning acknowledged would be true afterwards?
Also, I would think that if the block was gone and the index thus is left open, we should see a failure for it in the response?
Member
There was a problem hiding this comment.
Good observation :). I pushed 434696b to report error if closing block disappeared.
Member
|
@henningandersen I addressed your comments. Can you please give it another look? Thank you! |
henningandersen
approved these changes
May 22, 2019
| CloseIndexResponse() { | ||
| } | ||
|
|
||
| public CloseIndexResponse(final boolean acknowledged, final boolean shardsAcknowledged) { |
Contributor
There was a problem hiding this comment.
nit: maybe we should remove this constructor to ensure it is no longer used? I personally prefer to let the caller explicitly pass the empty list, but this may be personal preference so feel free to omit.
server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponseTests.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponseTests.java
Outdated
Show resolved
Hide resolved
# Conflicts: # server/src/test/java/org/elasticsearch/indices/state/CloseIndexIT.java
Member
|
@ywelsch @henningandersen Thanks for reviewing. |
dnhatn
pushed a commit
that referenced
this pull request
May 25, 2019
This changes the `CloseIndexResponse` so that it reports closing result
for each index. Shard failures or exception are also reported per index,
and the global acknowledgment flag is computed from the index results
only.
The response looks like:
```
{
"acknowledged" : true,
"shards_acknowledged" : true,
"indices" : {
"docs" : {
"closed" : true
}
}
}
```
The response reports shard failures like:
```
{
"acknowledged" : false,
"shards_acknowledged" : false,
"indices" : {
"docs-1" : {
"closed" : true
},
"docs-2" : {
"closed" : false,
"shards" : {
"1" : {
"failures" : [
{
"shard" : 1,
"index" : "docs-2",
"status" : "BAD_REQUEST",
"reason" : {
"type" : "index_closed_exception",
"reason" : "closed",
"index_uuid" : "JFmQwr_aSPiZbkAH_KEF7A",
"index" : "docs-2"
}
}
]
}
}
},
"docs-3" : {
"closed" : true
}
}
}
```
Co-authored-by: Tanguy Leroux <tlrx.dev@gmail.com>
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
This changes the `CloseIndexResponse` so that it reports closing result
for each index. Shard failures or exception are also reported per index,
and the global acknowledgment flag is computed from the index results
only.
The response looks like:
```
{
"acknowledged" : true,
"shards_acknowledged" : true,
"indices" : {
"docs" : {
"closed" : true
}
}
}
```
The response reports shard failures like:
```
{
"acknowledged" : false,
"shards_acknowledged" : false,
"indices" : {
"docs-1" : {
"closed" : true
},
"docs-2" : {
"closed" : false,
"shards" : {
"1" : {
"failures" : [
{
"shard" : 1,
"index" : "docs-2",
"status" : "BAD_REQUEST",
"reason" : {
"type" : "index_closed_exception",
"reason" : "closed",
"index_uuid" : "JFmQwr_aSPiZbkAH_KEF7A",
"index" : "docs-2"
}
}
]
}
}
},
"docs-3" : {
"closed" : true
}
}
}
```
Co-authored-by: Tanguy Leroux <tlrx.dev@gmail.com>
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
Relates elastic#39687
tlrx
added a commit
that referenced
this pull request
Jul 24, 2019
The CloseIndexResponse was improved in #39687; this commit exposes it in the HLRC.
tlrx
added a commit
that referenced
this pull request
Jul 24, 2019
16 tasks
russcam
added a commit
to elastic/elasticsearch-net
that referenced
this pull request
Sep 2, 2019
Relates: #4001 Relates: elastic/elasticsearch#39687 This commit adds shards_acknowledged and indices resuls to CloseIndexResponse.
russcam
added a commit
to elastic/elasticsearch-net
that referenced
this pull request
Sep 4, 2019
) Relates: #4001 Relates: elastic/elasticsearch#39687 This commit adds shards_acknowledged and indices resuls to CloseIndexResponse.
russcam
added a commit
to elastic/elasticsearch-net
that referenced
this pull request
Sep 4, 2019
) Relates: #4001 Relates: elastic/elasticsearch#39687 This commit adds shards_acknowledged and indices resuls to CloseIndexResponse. (cherry picked from commit 169b784)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This changes the
CloseIndexResponseso that it reports closing result for each index. Shard failures or exception are also reported per index, and the global acknowledgment flag is computed from the index results only.The response looks like:
The response reports shard failures like:
Relates #33888