Skip to content

Fix token Invalidation when retries exhausted #39799

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

Merged
merged 2 commits into from
Mar 8, 2019
Merged

Fix token Invalidation when retries exhausted #39799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d76b11f
Done
albertzaharovits Mar 7, 2019
40ae253
Merge branch 'master' into fix_token_invalid_retry
albertzaharovits Mar 8, 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
22 changes: 13 additions & 9 deletions ...ck/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,20 +679,24 @@ private void indexInvalidation(Collection<String> tokenIds, ActionListener<Token
}
}
}
if (retryTokenDocIds.isEmpty() == false) {
if (backoff.hasNext()) {
logger.debug("failed to invalidate [{}] tokens out of [{}], retrying to invalidate these too",
retryTokenDocIds.size(), tokenIds.size());
final TokensInvalidationResult incompleteResult = new TokensInvalidationResult(invalidated,
if (retryTokenDocIds.isEmpty() == false && backoff.hasNext()) {
logger.debug("failed to invalidate [{}] tokens out of [{}], retrying to invalidate these too",
retryTokenDocIds.size(), tokenIds.size());
final TokensInvalidationResult incompleteResult = new TokensInvalidationResult(invalidated,
previouslyInvalidated, failedRequestResponses);
final Runnable retryWithContextRunnable = client.threadPool().getThreadContext().preserveContext(
final Runnable retryWithContextRunnable = client.threadPool().getThreadContext().preserveContext(
() -> indexInvalidation(retryTokenDocIds, listener, backoff, srcPrefix, incompleteResult));
client.threadPool().schedule(retryWithContextRunnable, backoff.next(), GENERIC);
} else {
client.threadPool().schedule(retryWithContextRunnable, backoff.next(), GENERIC);
} else {
if (retryTokenDocIds.isEmpty() == false) {
logger.warn("failed to invalidate [{}] tokens out of [{}] after all retries", retryTokenDocIds.size(),
tokenIds.size());
for (String retryTokenDocId : retryTokenDocIds) {
failedRequestResponses.add(
new ElasticsearchException("Error invalidating [{}] with doc id [{}] after retries exhausted",
srcPrefix, retryTokenDocId));
}
}
} else {
final TokensInvalidationResult result = new TokensInvalidationResult(invalidated, previouslyInvalidated,
failedRequestResponses);
listener.onResponse(result);
Expand Down