otterc commented on a change in pull request #29855:
URL: https://github.com/apache/spark/pull/29855#discussion_r493865253
##########
File path:
common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java
##########
@@ -238,12 +259,26 @@ public String getID() {
}
} catch (Exception e) {
logger.error("Error while invoking RpcHandler#receive() on RPC id " +
req.requestId, e);
- respond(new RpcFailure(req.requestId,
Throwables.getStackTraceAsString(e)));
+ try {
+ // It's OK to respond the original metadata buffer here, because this
is still inside
+ // the invocation of this method.
+ respond(new RpcFailure(req.requestId,
+ JavaUtils.encodeHeaderIntoErrorString(req.meta.nioByteBuffer(),
e)));
+ } catch (IOException ioe) {
+ // No exception will be thrown here. req.meta.nioByteBuffer will not
throw IOException
+ // because it's a NettyManagedBuffer. This try-catch block is to make
compiler happy.
+ logger.error("Error in handling failure while invoking
RpcHandler#receive() on RPC id "
+ + req.requestId, e);
Review comment:
Nit: Use `{}` instead of `+`
##########
File path:
common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java
##########
@@ -258,6 +293,16 @@ private void processOneWayMessage(OneWayMessage req) {
}
}
+ /**
+ * Make a full copy of a nio ByteBuffer.
+ */
+ private ByteBuffer cloneBuffer(ByteBuffer buf) {
Review comment:
Nit: can be `static`
##########
File path:
common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ErrorHandler.java
##########
@@ -0,0 +1,72 @@
+/*
+ * 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 java.net.ConnectException;
+
+/**
+ * Plugs into {@link RetryingBlockFetcher} to further control when an
exception should be retried
+ * and logged.
+ * Note: {@link RetryingBlockFetcher} will delegate the exception to this
handler only when
+ * - remaining retries < max retries
+ * - exception is either an IOException or SaslException
Review comment:
Nit: Please remove `SaslException`
##########
File path:
common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/BlockPushExceptionSuite.java
##########
@@ -0,0 +1,41 @@
+/*
+ * 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 java.io.IOException;
+
+import com.google.common.base.Throwables;
+import org.junit.Test;
+
+import org.apache.spark.network.shuffle.protocol.PushBlockStream;
+import org.apache.spark.network.util.JavaUtils;
+
+import static org.junit.Assert.*;
Review comment:
Nit: import order?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
