Fix calculation of next delay for delayed shard allocation #14765
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.
Currently the next delay is calculated based on System.currentTimeMillis() but the actual shards to delay based on the last time the GatewayAllocator tried to assign/delay the shard.
This introduces an inconsistency for the case where shards should have been delay-allocated between the GatewayAllocator-based timestamp and System.currentTimeMillis().
Failing test highlighting the issue:
http://build-us-00.elastic.co/job/es_core_master_centos/8512/testReport/junit/org.elasticsearch.cluster.routing/RoutingServiceTests/testDelayedUnassignedScheduleRerouteAfterDelayedReroute/
Relevant lines of log output:
Analysis:
Two shards fail, one with a delay configured to 100ms ([short_delay][0]), the other configured to 10s ([long_delay][0]).
The last line of log shows that 2 shards have been correctly recognised as being delay-unassigned. But, as the last log line has been executed more than 100ms after the node failure, only long_delay is taken into account for calculating the next check.