[#1267][followup] improvement(client): The previous exception may be discarded when OOM occurs #1411
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
…scarded when OOM occurs
rickyma
force-pushed
the
followup-issue-1267
branch
from
cc39876
to
3194717
Compare
|
PTAL @zuston |
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #1411 +/- ##
============================================
+ Coverage 53.24% 55.15% +1.91%
- Complexity 2719 2773 +54
============================================
Files 419 403 -16
Lines 23966 21823 -2143
Branches 2042 2058 +16
============================================
- Hits 12760 12036 -724
+ Misses 10418 9048 -1370
+ Partials 788 739 -49 ☔ View full report in Codecov by Sentry. |
jerqi
changed the title
|
@zuston Can you review this? |
|
Some details have been improved, please review. @zuston @jerqi
|
|
cc @zuston |
zuston
reviewed
Jan 6, 2024
client-spark/spark3/src/main/java/org/apache/spark/shuffle/DelegationRssShuffleManager.java
Outdated
Show resolved
Hide resolved
| @@ -154,7 +155,7 @@ public RssSendShuffleDataResponse sendShuffleData(RssSendShuffleDataRequest requ | |||
| maxRetryAttempts, | |||
| t -> !(t instanceof OutOfMemoryError)); | |||
| } catch (Throwable throwable) { | |||
| LOG.warn(throwable.getMessage()); | |||
| LOG.warn(ExceptionUtils.getStackTrace(throwable)); | |||
There was a problem hiding this comment.
why not using throwable directly ?
There was a problem hiding this comment.
Because LOG.warn does not accept a Throwable type parameter, it only accepts a string.
As I mentioned above, I use ExceptionUtils.getStackTrace(e) just for the sake of minimal code changes and simplicity.
If you prefer using throwable directly, I will change it like below:
LOG.warn("Failed to send shuffle data due to ", throwable);
There was a problem hiding this comment.
LOG.warn("Failed to send shuffle data due to ", throwable); +1
internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java
Outdated
Show resolved
Hide resolved
common/src/main/java/org/apache/uniffle/common/util/RetryUtils.java
Outdated
Show resolved
Hide resolved
rickyma
force-pushed
the
followup-issue-1267
branch
2 times, most recently
from
c1349ca
to
6950f33
Compare
rickyma
commented
Jan 8, 2024
common/src/main/java/org/apache/uniffle/common/util/RetryUtils.java
Outdated
Show resolved
Hide resolved
|
Can you continue to review this PR? I think at least for my case, this PR is still very useful. @zuston |
zuston
reviewed
Jan 13, 2024
client-spark/spark3/src/main/java/org/apache/spark/shuffle/DelegationRssShuffleManager.java
Outdated
Show resolved
Hide resolved
internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java
Outdated
Show resolved
Hide resolved
| @@ -154,7 +155,7 @@ public RssSendShuffleDataResponse sendShuffleData(RssSendShuffleDataRequest requ | |||
| maxRetryAttempts, | |||
| t -> !(t instanceof OutOfMemoryError)); | |||
| } catch (Throwable throwable) { | |||
| LOG.warn(throwable.getMessage()); | |||
| LOG.warn(ExceptionUtils.getStackTrace(throwable)); | |||
There was a problem hiding this comment.
LOG.warn("Failed to send shuffle data due to ", throwable); +1
common/src/main/java/org/apache/uniffle/common/util/RetryUtils.java
Outdated
Show resolved
Hide resolved
rickyma
force-pushed
the
followup-issue-1267
branch
3 times, most recently
from
99c6c40
to
45c422d
Compare
|
Done. @zuston |
rickyma
force-pushed
the
followup-issue-1267
branch
from
45c422d
to
3b9d9fe
Compare
…ay be discarded when OOM occurs
rickyma
force-pushed
the
followup-issue-1267
branch
from
3b9d9fe
to
e6274c2
Compare
smallzhongfeng
pushed a commit
that referenced
this pull request
Feb 6, 2024
…in RetryUtils (#1500) ### What changes were proposed in this pull request? INFO log level should be used in RetryUtils. Because these log messages are not actual errors. ### Why are the changes needed? It's a followup PR for [#1411](#1411). ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing UTs.
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.
What changes were proposed in this pull request?
Save the previous exception in advance to prevent it from being lost during the next retry.
Why are the changes needed?
This is the follow up pr of #1344
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Existing UTs.