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.
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
fix: close executor when closing pool #501
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -390,26 +390,34 @@ void checkAndCloseSpanners(CheckAndCloseSpannersMode mode) { | |
keysStillInUse.add(entry.getKey()); | ||
} | ||
} | ||
if (keysStillInUse.isEmpty() || mode == CheckAndCloseSpannersMode.WARN) { | ||
if (!keysStillInUse.isEmpty()) { | ||
try { | ||
if (keysStillInUse.isEmpty() || mode == CheckAndCloseSpannersMode.WARN) { | ||
if (!keysStillInUse.isEmpty()) { | ||
logLeakedConnections(keysStillInUse); | ||
logger.log( | ||
Level.WARNING, | ||
"There is/are " | ||
+ keysStillInUse.size() | ||
+ " connection(s) still open." | ||
+ " Close all connections before stopping the application"); | ||
} | ||
// Force close all Spanner instances by passing in a value that will always be less than | ||
// the | ||
// difference between the current time and the close time of a connection. | ||
closeUnusedSpanners(Long.MIN_VALUE); | ||
} else { | ||
logLeakedConnections(keysStillInUse); | ||
logger.log( | ||
Level.WARNING, | ||
throw SpannerExceptionFactory.newSpannerException( | ||
ErrorCode.FAILED_PRECONDITION, | ||
"There is/are " | ||
+ keysStillInUse.size() | ||
+ " connection(s) still open." | ||
+ " Close all connections before stopping the application"); | ||
+ " connection(s) still open. Close all connections before calling closeSpanner()"); | ||
} | ||
// Force close all Spanner instances by passing in a value that will always be less than the | ||
// difference between the current time and the close time of a connection. | ||
closeUnusedSpanners(Long.MIN_VALUE); | ||
} else { | ||
logLeakedConnections(keysStillInUse); | ||
throw SpannerExceptionFactory.newSpannerException( | ||
ErrorCode.FAILED_PRECONDITION, | ||
"There is/are " | ||
+ keysStillInUse.size() | ||
+ " connection(s) still open. Close all connections before calling closeSpanner()"); | ||
} finally { | ||
if (closerService != null) { | ||
closerService.shutdown(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can this throw an exception? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Normally, no. It does not declare any checked exceptions, and it also does not wait until it has actually been shutdown, so the chance that anything goes wrong is relatively low. The method can be invoked in two ways:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Cool, that is fine, I was just worried that we could bubble up exceptions that we previously did not. |
||
} | ||
initialized = false; | ||
} | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only real change here is the addition of the
finally
block, but GitHub thinks there is a lot more changed because of the changed indentation and formatting.