You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2025/01/24 05:20:49 UTC
(spark) branch branch-4.0 updated: [SPARK-50853][CORE] Close temp shuffle file writable channel
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 1523dfd1094f [SPARK-50853][CORE] Close temp shuffle file writable channel
1523dfd1094f is described below
commit 1523dfd1094f5e2cbc8f04584522653d72e3629f
Author: Michael Chen <mi...@workday.com>
AuthorDate: Thu Jan 23 21:20:32 2025 -0800
[SPARK-50853][CORE] Close temp shuffle file writable channel
### What changes were proposed in this pull request?
Currently, there are two implementations of DownloadFileWritableChannel (which is used for writing data fetched to disk), SimpleDownloadWritableChannel and EncryptedDownloadWritableChannel. The latter closes the writable channel in it's implementation of closeAndRead method while the former does not. As a result, SimpleDownloadWritableChannel channel is never closed and is relying on either the finalizer in FileOutputStream or the phantom cleanable in FileDescriptor to close the file [...]
### Why are the changes needed?
Should be closing file handles when they are not needed anymore instead of relying on finalizer/cleanables to do it.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Existing spark tests.
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #49531 from ChenMichael/SPARK-50853-close-temp-shuffle-file-channel.
Authored-by: Michael Chen <mi...@workday.com>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit 4e3b8318cac176642ad7111abf26e4315b5788d8)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
.../shuffle/DownloadFileWritableChannel.java | 3 +-
.../spark/network/shuffle/SimpleDownloadFile.java | 3 +-
.../network/shuffle/SimpleDownloadFileSuite.java | 48 ++++++++++++++++++++++
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/DownloadFileWritableChannel.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/DownloadFileWritableChannel.java
index dbbbac43eb74..802e373ddd11 100644
--- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/DownloadFileWritableChannel.java
+++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/DownloadFileWritableChannel.java
@@ -19,6 +19,7 @@ package org.apache.spark.network.shuffle;
import org.apache.spark.network.buffer.ManagedBuffer;
+import java.io.IOException;
import java.nio.channels.WritableByteChannel;
/**
@@ -26,5 +27,5 @@ import java.nio.channels.WritableByteChannel;
* after the writer has been closed. Used with DownloadFile and DownloadFileManager.
*/
public interface DownloadFileWritableChannel extends WritableByteChannel {
- ManagedBuffer closeAndRead();
+ ManagedBuffer closeAndRead() throws IOException;
}
diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/SimpleDownloadFile.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/SimpleDownloadFile.java
index 97ecaa627b66..0acca3fdd6a4 100644
--- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/SimpleDownloadFile.java
+++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/SimpleDownloadFile.java
@@ -69,7 +69,8 @@ public class SimpleDownloadFile implements DownloadFile {
}
@Override
- public ManagedBuffer closeAndRead() {
+ public ManagedBuffer closeAndRead() throws IOException {
+ channel.close();
return new FileSegmentManagedBuffer(transportConf, file, 0, file.length());
}
diff --git a/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/SimpleDownloadFileSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/SimpleDownloadFileSuite.java
new file mode 100644
index 000000000000..120455eeb935
--- /dev/null
+++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/SimpleDownloadFileSuite.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.network.shuffle;
+
+import org.apache.spark.network.util.MapConfigProvider;
+import org.apache.spark.network.util.TransportConf;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Assertions;
+
+public class SimpleDownloadFileSuite {
+ @Test
+ public void testChannelIsClosedAfterCloseAndRead() throws IOException {
+ File tempFile = File.createTempFile("testChannelIsClosed", ".tmp");
+ tempFile.deleteOnExit();
+ TransportConf conf = new TransportConf("test", MapConfigProvider.EMPTY);
+
+ DownloadFile downloadFile = null;
+ try {
+ downloadFile = new SimpleDownloadFile(tempFile, conf);
+ DownloadFileWritableChannel channel = downloadFile.openForWriting();
+ channel.closeAndRead();
+ Assertions.assertFalse(channel.isOpen(), "Channel should be closed after closeAndRead.");
+ } finally {
+ if (downloadFile != null) {
+ downloadFile.delete();
+ }
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org