ywcb00 commented on code in PR #2496: URL: https://github.com/apache/systemds/pull/2496#discussion_r3453520965
########## src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedChunkProtocol.java: ########## @@ -0,0 +1,52 @@ +/* + * 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.sysds.runtime.controlprogram.federated; + +import io.netty.handler.codec.LengthFieldBasedFrameDecoder; + +final class FederatedChunkProtocol { + static final byte TYPE_DATA = 0; + static final byte TYPE_END = 1; + static final byte TYPE_ERROR = 2; + + static final byte MARKER_LEGACY = 0; + static final byte MARKER_CHUNKED = 1; + static final long STREAM_THRESHOLD = 1536L << 20; // ~1.5 GB: route below this through the legacy object codec Review Comment: We should keep the regular encoder as long as we can, i.e., up to the largest possible message size. Can we increase this default threshold from 1.5GB to (INT_MAX - 1) bytes? ########## src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedFormatDetector.java: ########## @@ -0,0 +1,45 @@ +/* + * 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.sysds.runtime.controlprogram.federated; + +import java.util.List; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelPipeline; +import io.netty.handler.codec.ByteToMessageDecoder; + +public final class FederatedFormatDetector extends ByteToMessageDecoder { Review Comment: Would it be more intuitive to name this class "FederatedFormatDecoder"? ########## src/test/java/org/apache/sysds/test/functions/federated/network/FederatedMaxPayloadTest.java: ########## @@ -0,0 +1,81 @@ +/* + * 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.sysds.test.functions.federated.network; + +import java.net.InetSocketAddress; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.apache.sysds.runtime.controlprogram.federated.FederatedData; +import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest; +import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse; +import org.apache.sysds.runtime.matrix.data.MatrixBlock; +import org.apache.sysds.test.AutomatedTestBase; +import org.apache.sysds.test.TestConfiguration; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +@Ignore("heavy: client+worker share one JVM, so it holds two ~2GB matrix copies. Needs a ~9GB fork " + + "heap; -DargLine is ignored here (pom uses @{argLine}), so bump the pom 'argLine' property " + + "(e.g. -Xmx9g) to run manually. Verified green: 2.158GB streamed end-to-end past the 2GB Netty cap.") +public class FederatedMaxPayloadTest extends AutomatedTestBase { + + private final static String TEST_NAME = "FederatedMaxPayloadTest"; + private final static String TEST_DIR = "functions/federated/network/"; + private final static String TEST_CLASS_DIR = TEST_DIR + FederatedMaxPayloadTest.class.getSimpleName() + "/"; + + @Override + public void setUp() { + addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] {""})); + } + + @Test + public void transferOverTwoGigabytePayload() { + int port = getRandomAvailablePort(); + startLocalFedWorkerThread(port); + try { + MatrixBlock mb = denseMatrixExceedingTwoGigabytes(); + InetSocketAddress address = new InetSocketAddress("localhost", port); + FederatedRequest request = new FederatedRequest(FederatedRequest.RequestType.PUT_VAR, 1, mb); + + Future<FederatedResponse> response = FederatedData.executeFederatedOperation(address, request); + Assert.assertTrue("Network send was not successful.", response.get().isSuccessful()); + } + catch(ExecutionException e) { + Assert.fail("Federated transfer failed: " + e.getMessage()); + } Review Comment: No need for this catch as the exception is anyways caught by the following, identical catch. (redundant) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
