ActiveShardCount should not fail when closing the index #35936
Merged
Conversation
This file contains 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
tlrx
added
>bug
v7.0.0
:Distributed/Distributed
|
Pinging @elastic/es-distributed |
ywelsch
suggested changes
Nov 27, 2018
server/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java
Show resolved
Hide resolved
| @@ -317,6 +322,26 @@ public void testOpenWaitingForActiveShardsFailed() throws Exception { | |||
| ensureGreen("test"); | |||
| } | |||
|
|
|||
| public void testCloseUnassignedIndex() throws Exception { | |||
There was a problem hiding this comment.
Let's try to avoid writing these kind of integration tests that simulate a complicated series of steps to reproduce a corner case. Maybe instead add a unit test to ActiveShardCountTests?
There was a problem hiding this comment.
Maybe instead add a unit test to
ActiveShardCountTests?
Ok
Let's try to avoid writing these kind of integration tests that simulate a complicated series of steps to reproduce a corner case.
Well, I've been surprised that we didn't have any integration test that closes an unassigned index so I added one. On the other hand this won't play well with replicated closed indices so it's better to not add it, I agree.
ywelsch
approved these changes
Nov 28, 2018
server/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java
Outdated
Show resolved
Hide resolved
|
Thanks @ywelsch |
tlrx
added a commit
that referenced
this pull request
Nov 29, 2018
The ActiveShardCount is used by cluster state observers to wait for a given number of shards to be active before returning to the caller. The current implementation does not work when an index is closed while an observer is waiting on shards to be active. In this case, a NPE is thrown and the observer is never notified that the shards won't become active. This commit fixes the ActiveShardCount.enoughShardsActive() so that it does not fail when an index is closed, similarly to what is done when an index is deleted.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
ActiveShardCountis used by cluster state observers to wait for a given number of shards to be active before returning to the caller. The current implementation does not work when an index is closed while an observer is waiting on shards to be active. In this case, a NPE is thrown and the observer is never notified that the shards won't become active.This pull request fixes the
ActiveShardCount.enoughShardsActive()so that it returns "OK" when an index is closed, similarly to what is done when an index is deleted. It also adds a test that would have fail with the previous behavior.