fix: gremlin exec timeout cause statement unclose #1643
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix bug: gremlin语句执行超时 将导致内存泄漏statement未释放 fix apache#1639
Fix bug: gremlin语句执行超时 将导致内存泄漏statement未释放 fix apache#1639
Codecov Report
@@ Coverage Diff @@
## master #1643 +/- ##
============================================
- Coverage 66.99% 66.96% -0.03%
+ Complexity 7069 7067 -2
============================================
Files 421 421
Lines 34646 34655 +9
Branches 4798 4798
============================================
- Hits 23210 23208 -2
- Misses 9094 9102 +8
- Partials 2342 2345 +3
Continue to review full report at Codecov.
|
javeme
reviewed
Nov 10, 2021
| return this.query.reachLimit(count); | ||
| try { | ||
| checkInterrupted(); | ||
| return this.query.reachLimit(count); |
There was a problem hiding this comment.
it's ok to just catch checkInterrupted(), we assume other exception will be handled by upper layer.
| try { | ||
| checkInterrupted(); | ||
| return this.query.reachLimit(count); | ||
| } catch (BackendException e) { |
| LOG.warn("Failed to close backend entry iterator for interrupted query", ex); | ||
| } | ||
| throw e; | ||
| } |
There was a problem hiding this comment.
also catch QueryResults.toList(Iterator<T> iterator) which may cause leak if exception occurred, and close in finally block:
try {
return new ListIterator<>(Query.DEFAULT_CAPACITY, iterator);
} finally {
CloseableIterator.closeIterator(iterator);
}Fix bug: gremlin语句执行超时 将导致内存泄漏statement未释放 fix apache#1639
Fix bug: gremlin语句执行超时 将导致内存泄漏statement未释放 fix apache#1639
javeme
reviewed
Nov 10, 2021
| } catch (Throwable e) { | ||
| try { | ||
| this.close(); | ||
| } catch (Exception ex) { |
| checkInterrupted(); | ||
| try { | ||
| checkInterrupted(); | ||
| } catch (Throwable e) { |
There was a problem hiding this comment.
don't need a space between "catch ("
Fix bug: gremlin语句执行超时 将导致内存泄漏statement未释放 fix apache#1639
javeme
approved these changes
Nov 11, 2021
imbajin
approved these changes
Nov 11, 2021
zhoney
approved these changes
Nov 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix bug: gremlin语句执行超时 将导致内存泄漏statement未释放
fix #1639