Skip to content

Replace cache invalidation with TokenPoll.error #10712

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
kokosing merged 1 commit into from
Feb 2, 2022
Merged

Replace cache invalidation with TokenPoll.error #10712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class OAuth2TokenExchange
{
public static final Duration MAX_POLL_TIME = new Duration(10, SECONDS);
private static final TokenPoll TOKEN_POLL_TIMED_OUT = TokenPoll.error("Authentication has timed out");
private static final TokenPoll TOKEN_POLL_DROPPED = TokenPoll.error("Authentication has been finished by the client");

private final LoadingCache<String, SettableFuture<TokenPoll>> cache;
private final ScheduledExecutorService executor = newSingleThreadScheduledExecutor(daemonThreadsNamed("oauth2-token-exchange"));
Expand Down Expand Up @@ -91,9 +92,7 @@ public ListenableFuture<TokenPoll> getTokenPoll(UUID authId)

public void dropToken(UUID authId)
{
// TODO this may not invalidate ongoing loads (https://github.com/trinodb/trino/issues/10512, https://github.com/google/guava/issues/1881).
// Determine whether this is OK here.
cache.invalidate(hashAuthId(authId));
cache.getUnchecked(hashAuthId(authId)).set(TOKEN_POLL_DROPPED);
}

public static String hashAuthId(UUID authId)
Expand Down