This is an automated email from the ASF dual-hosted git repository.
taiyangli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 0ec4b161a [CELEBORN] CelebornShuffleManager#stop should stop non-null
_vanillaCelebornShuffleManager (#6371)
0ec4b161a is described below
commit 0ec4b161ae43b20af3fc3096275e03d812760525
Author: Nicholas Jiang <[email protected]>
AuthorDate: Tue Jul 9 09:30:51 2024 +0700
[CELEBORN] CelebornShuffleManager#stop should stop non-null
_vanillaCelebornShuffleManager (#6371)
---
.../spark/shuffle/gluten/celeborn/CelebornShuffleManager.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git
a/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
b/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
index e61aeb3d7..6b450dea7 100644
---
a/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
+++
b/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
@@ -93,7 +93,7 @@ public class CelebornShuffleManager implements ShuffleManager
{
private final Object shuffleIdTracker;
// for Celeborn 0.4.0
- private boolean throwsFetchFailure;
+ private final boolean throwsFetchFailure;
public CelebornShuffleManager(SparkConf conf) {
if (conf.getBoolean(LOCAL_SHUFFLE_READER_KEY, true)) {
@@ -244,10 +244,14 @@ public class CelebornShuffleManager implements
ShuffleManager {
lifecycleManager.stop();
lifecycleManager = null;
}
- if (columnarShuffleManager() != null) {
- columnarShuffleManager().stop();
+ if (_columnarShuffleManager != null) {
+ _columnarShuffleManager.stop();
_columnarShuffleManager = null;
}
+ if (_vanillaCelebornShuffleManager != null) {
+ _vanillaCelebornShuffleManager.stop();
+ _vanillaCelebornShuffleManager = null;
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
