sarutak commented on code in PR #57954:
URL: https://github.com/apache/spark/pull/57954#discussion_r3789992977
##########
core/src/main/java/org/apache/spark/security/CredentialProviderLoader.java:
##########
@@ -256,25 +261,23 @@ public static Set<String> discoverAllSchemes() {
* <p>
* This method iterates over all providers that have been initialized via
* {@link CredentialProvider#init(Map)} and calls {@link
CredentialProvider#close()}
- * on each. If any provider's {@code close()} throws, the exception is
suppressed
- * and attached to the first exception encountered. If at least one
exception occurred,
- * it is thrown after all providers have been attempted.
+ * on each. The first exception is retained, later exceptions are suppressed
onto it, and the
+ * first exception is rethrown after all providers have been attempted.
* <p>
- * After this method returns (normally or exceptionally), the initialization
tracking
- * is cleared, but the cached provider list is retained. This means
providers would be
- * re-initialized on the next {@link #providerFor} call (which is not
expected after
- * shutdown).
+ * After shutdown begins, subsequent {@link #providerFor} calls fail rather
than
+ * re-initializing a cached provider whose resources have already been
released.
* <p>
* <b>Contract:</b> {@code close()} implementations must not call back into
* {@code CredentialProviderLoader} methods (e.g., {@code providerFor}).
*
* @throws Exception if one or more providers threw during close
*/
- public static void closeAll() throws Exception {
+ public void closeAll() throws Exception {
List<CredentialProvider> toClose;
- synchronized (CredentialProviderLoader.class) {
+ synchronized (this) {
// Copy and clear under the lock to prevent double-close if closeAll()
is called
// again concurrently, and to avoid ConcurrentModificationException.
+ providersClosed = true;
Review Comment:
I think the concerns you raised (the `shutdownNow()` race and classloader
scoping) are orthogonal to whether the loader is static or instance-based:
1. **The `shutdownNow()` race**: An in-flight renewal thread can still call
`providerFor()` on the instance after `closeAll()`. The solution in both
approaches is the same. In other words, a `providersClosed` flag that throws
`IllegalStateException`.
2. **Classloader scoping**: Both the static and instance-based
`loadProviders()` use `Thread.currentThread().getContextClassLoader()`
identically. Instance-based does not change this behavior.
To resolve these, we need a `providersClosed` guard (or simply rely on
`shutdownNow()` + interrupt handling in the renewal task). That fix is the same
regardless of static vs. instance. Given that, I'd prefer to keep the simpler
static design and apply the minimal fix (`cachedProviders = null` in
`closeAll()`).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
