Victsm commented on a change in pull request #29855: URL: https://github.com/apache/spark/pull/29855#discussion_r502934506
########## File path: common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ErrorHandler.java ########## @@ -0,0 +1,92 @@ +/* + * 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 an IOException + */ + +public interface ErrorHandler { + + boolean shouldRetryError(Throwable t); + + default boolean shouldLogError(Throwable t) { + return true; + } + + /** + * A no-op error handler instance. + */ + ErrorHandler NOOP_ERROR_HANDLER = t -> true; + + /** + * The error handler for pushing shuffle blocks to remote shuffle services. + */ + class BlockPushErrorHandler implements ErrorHandler { + /** + * String constant used for generating exception messages indicating a block to be merged + * arrives too late on the server side, and also for later checking such exceptions on the + * client side. When we get a block push failure because of the block arrives too late, we + * will not retry pushing the block nor log the exception on the client side. + */ + public static final String TOO_LATE_MESSAGE_SUFFIX = + "received after merged shuffle is finalized"; + + /** + * String constant used for generating exception messages indicating the server couldn't + * append a block after all available attempts due to collision with other blocks belonging + * to the same shuffle partition, and also for later checking such exceptions on the client + * side. When we get a block push failure because of the block couldn't be written due to + * this reason, we will not log the exception on the client side. + */ + public static final String COULD_NOT_FIND_OPPORTUNITY_MSG_PREFIX = + "Couldn't find an opportunity to write block"; + + + @Override + public boolean shouldRetryError(Throwable t) { + // If it is a connection time out or a connection closed exception, no need to retry. + if (t.getCause() != null && t.getCause() instanceof ConnectException) { + return false; + } + // If the block is too late, there is no need to retry it + return (t.getMessage() == null || + !t.getMessage().contains(TOO_LATE_MESSAGE_SUFFIX)) && + (t.getCause() == null || t.getCause().getMessage() == null || + !t.getCause().getMessage().contains(TOO_LATE_MESSAGE_SUFFIX)); + } + + @Override + public boolean shouldLogError(Throwable t) { + return (t.getMessage() == null || + (!t.getMessage().contains(COULD_NOT_FIND_OPPORTUNITY_MSG_PREFIX) && + !t.getMessage().contains(TOO_LATE_MESSAGE_SUFFIX))) && + (t.getCause() == null || t.getCause().getMessage() == null || + (!t.getCause().getMessage() + .contains(COULD_NOT_FIND_OPPORTUNITY_MSG_PREFIX) && + !t.getCause().getMessage() + .contains(TOO_LATE_MESSAGE_SUFFIX))); Review comment: You mean the one on line 84? It should be `&&`, since we need to check both places. ---------------------------------------------------------------- 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: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
