Update based on apache#2427

mridulm · Mar 27, 2024 · ac3254c · ac3254c
1 parent 3638558
commit ac3254c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/LICENSE b/LICENSE
@@ -220,6 +220,7 @@ Apache Spark
 ./common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
 ./common/src/main/java/org/apache/celeborn/common/util/JavaUtils.java
 ./common/src/main/scala/org/apache/celeborn/common/util/SignalUtils.scala
+./common/src/test/java/org/apache/celeborn/common/network/protocol/EncryptedMessageWithHeaderSuiteJ.java
 ./common/src/test/java/org/apache/celeborn/common/network/ssl/ReloadingX509TrustManagerSuiteJ.java
 ./common/src/test/java/org/apache/celeborn/common/network/ssl/SslSampleConfigs.java
 ./worker/src/main/java/org/apache/celeborn/service/deploy/worker/shuffledb/DB.java

diff --git a/common/src/main/java/org/apache/celeborn/common/network/buffer/ManagedBuffer.java b/common/src/main/java/org/apache/celeborn/common/network/buffer/ManagedBuffer.java
@@ -80,9 +80,6 @@ public abstract class ManagedBuffer {
    *
    * <p>If this method returns a ByteBuf, then that buffer's reference count will be incremented and
    * the caller will be responsible for releasing this new reference.
-   *
-   * <p>Once `kernel.ssl.sendfile` and OpenSSL's `ssl_sendfile` are more widely adopted (and
-   * supported in Netty), we can potentially deprecate these APIs and just use `convertToNetty`.
    */
   public abstract Object convertToNettyForSsl() throws IOException;
 }
diff --git a/...src/main/java/org/apache/celeborn/common/network/protocol/EncryptedMessageWithHeader.java b/...src/main/java/org/apache/celeborn/common/network/protocol/EncryptedMessageWithHeader.java
@@ -34,7 +34,8 @@
 /**
  * A wrapper message that holds two separate pieces (a header and a body).
  *
- * <p>The header must be a ByteBuf, while the body can be any InputStream or ChunkedStream
+ * <p>The header must be a ByteBuf, while the body can be any InputStream or ChunkedStream Based on
+ * common/network-common/org.apache.spark.network.protocol.EncryptedMessageWithHeader
  */
 public class EncryptedMessageWithHeader implements ChunkedInput<ByteBuf> {
 

diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/SslMessageEncoder.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/SslMessageEncoder.java
@@ -31,7 +31,8 @@
 
 /**
  * Encoder used by the server side to encode secure (SSL) server-to-client responses. This encoder
- * is stateless so it is safe to be shared by multiple threads.
+ * is stateless so it is safe to be shared by multiple threads. Based on
+ * common/network-common/org.apache.spark.network.protocol.SslMessageEncoder
  */
 @ChannelHandler.Sharable
 public final class SslMessageEncoder extends MessageToMessageEncoder<Message> {

diff --git a/...st/java/org/apache/celeborn/common/network/protocol/EncryptedMessageWithHeaderSuiteJ.java b/...st/java/org/apache/celeborn/common/network/protocol/EncryptedMessageWithHeaderSuiteJ.java
@@ -35,6 +35,9 @@
 import org.apache.celeborn.common.network.buffer.ManagedBuffer;
 import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
 
+/*
+ * Based on common/network-common/org.apache.spark.network.protocol.EncryptedMessageWithHeaderSuite
+ */
 public class EncryptedMessageWithHeaderSuiteJ {
 
   // Tests the case where the body is an input stream and that we manage the refcounts of the