Skip to content

Playing around with Executors. #46988

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Playing around with Executors. #46988

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
32 changes: 25 additions & 7 deletions ...ty/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.function.Function;
Expand Down Expand Up @@ -143,6 +145,14 @@ public abstract class IdentityClientBase {
private Method getMsalRuntimeBroker;
HttpPipeline httpPipeline;

// Dedicated pool for MSAL async work to avoid circular waits with SharedExecutorService (which may use VTs).
private static final ExecutorService MSAL_EXECUTOR = Executors.newCachedThreadPool(r -> {
Thread t = new Thread(r);
t.setName("azure-identity-msal-" + t.getId());
t.setDaemon(true);
return t;
});

/**
* Creates an IdentityClient with the given options.
*
Expand Down Expand Up @@ -265,9 +275,12 @@ ConfidentialClientApplication getConfidentialClient(boolean enableCae) {
}

if (options.getExecutorService() != null) {
applicationBuilder.executorService(options.getExecutorService());
//applicationBuilder.executorService(options.getExecutorService());
applicationBuilder.executorService(MSAL_EXECUTOR);

} else {
applicationBuilder.executorService(SharedExecutorService.getInstance());
//applicationBuilder.executorService(SharedExecutorService.getInstance());
applicationBuilder.executorService(MSAL_EXECUTOR);
}

TokenCachePersistenceOptions tokenCachePersistenceOptions = options.getTokenCacheOptions();
Expand Down Expand Up @@ -328,9 +341,11 @@ PublicClientApplication getPublicClient(boolean sharedTokenCacheCredential, bool
}

if (options.getExecutorService() != null) {
builder.executorService(options.getExecutorService());
// builder.executorService(options.getExecutorService());
builder.executorService(MSAL_EXECUTOR);
} else {
builder.executorService(SharedExecutorService.getInstance());
// builder.executorService(SharedExecutorService.getInstance());
builder.executorService(MSAL_EXECUTOR);
}

if (enableCae) {
Expand Down Expand Up @@ -425,9 +440,11 @@ ManagedIdentityApplication getManagedIdentityMsalApplication() {
}

if (options.getExecutorService() != null) {
miBuilder.executorService(options.getExecutorService());
//miBuilder.executorService(options.getExecutorService());
miBuilder.executorService(MSAL_EXECUTOR);
} else {
miBuilder.executorService(SharedExecutorService.getInstance());
//miBuilder.executorService(SharedExecutorService.getInstance());
miBuilder.executorService(MSAL_EXECUTOR);
}

return miBuilder.build();
Expand Down Expand Up @@ -470,7 +487,8 @@ ConfidentialClientApplication getWorkloadIdentityConfidentialClient() {
if (options.getExecutorService() != null) {
applicationBuilder.executorService(options.getExecutorService());
} else {
applicationBuilder.executorService(SharedExecutorService.getInstance());
//applicationBuilder.executorService(SharedExecutorService.getInstance());
applicationBuilder.executorService(MSAL_EXECUTOR);
}

return applicationBuilder.build();
Expand Down
Loading