sarutak commented on code in PR #57954:
URL: https://github.com/apache/spark/pull/57954#discussion_r3767785399
##########
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:
Thanks for the followup, @cloud-fan. I agree that the `closeAll()` cache
inconsistency is a real issue in that after one manager closes providers, the
stale instances remain in `cachedProviders` and could be reinitialized by a
later SparkContext.
However, I think the root cause is simpler than what this PR addresses:
`closeAll()` clears `initializedProviders` but does not invalidate
`cachedProviders`. I think the following minimal fix is sufficient.
```java
public static void closeAll() throws Exception {
synchronized (CredentialProviderLoader.class) {
providersClosed = true;
cachedProviders = null; // force fresh ServiceLoader discovery on
next use
toClose = new ArrayList<>(initializedProviders);
initializedProviders.clear();
}
// ... close logic
}
```
This forces the next `providerFor()` call to re-run ServiceLoader discovery,
producing fresh instances. The `providersClosed` flag prevents accidental reuse
between close and the next SparkContext.
--
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]
