This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 6d0b6b9af462432aef17d753f2bd8c3b8e04b0a1 Author: Zhijiang <wangzhijiang...@aliyun.com> AuthorDate: Fri May 17 12:07:07 2019 +0800 [hotfix][coordination] Refactor PartitionException to PartitionUpdateException The current usage of PartitionException is only for describing the RPC of update parttitions failed, so the exception rename would not have any other effects. In flip1 PartitionException is used for presenting all the cases that indicate to restart the producer while the consumer failed. --- .../java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java | 4 ++-- .../{PartitionException.java => PartitionUpdateException.java} | 8 ++++---- .../flink/runtime/taskexecutor/TaskExecutorSubmissionTest.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java index b35d65e..dcfabbf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java @@ -80,7 +80,7 @@ import org.apache.flink.runtime.state.TaskLocalStateStore; import org.apache.flink.runtime.state.TaskStateManager; import org.apache.flink.runtime.state.TaskStateManagerImpl; import org.apache.flink.runtime.taskexecutor.exceptions.CheckpointException; -import org.apache.flink.runtime.taskexecutor.exceptions.PartitionException; +import org.apache.flink.runtime.taskexecutor.exceptions.PartitionUpdateException; import org.apache.flink.runtime.taskexecutor.exceptions.RegistrationTimeoutException; import org.apache.flink.runtime.taskexecutor.exceptions.SlotAllocationException; import org.apache.flink.runtime.taskexecutor.exceptions.SlotOccupiedException; @@ -637,7 +637,7 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway { }); } else { return FutureUtils.completedExceptionally( - new PartitionException("No reader with ID " + intermediateResultPartitionID + + new PartitionUpdateException("No reader with ID " + intermediateResultPartitionID + " for task " + executionAttemptID + " was found.")); } } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/exceptions/PartitionException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/exceptions/PartitionUpdateException.java similarity index 82% rename from flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/exceptions/PartitionException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/exceptions/PartitionUpdateException.java index eecd0ae..fa12426 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/exceptions/PartitionException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/exceptions/PartitionUpdateException.java @@ -23,19 +23,19 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutor; /** * Exception indicating a problem with the result partitions on the {@link TaskExecutor} side. */ -public class PartitionException extends TaskManagerException { +public class PartitionUpdateException extends TaskManagerException { private static final long serialVersionUID = 6248696963418276618L; - public PartitionException(String message) { + public PartitionUpdateException(String message) { super(message); } - public PartitionException(String message, Throwable cause) { + public PartitionUpdateException(String message, Throwable cause) { super(message, cause); } - public PartitionException(Throwable cause) { + public PartitionUpdateException(Throwable cause) { super(cause); } } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorSubmissionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorSubmissionTest.java index 711256e..cde7259 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorSubmissionTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorSubmissionTest.java @@ -53,7 +53,7 @@ import org.apache.flink.runtime.jobmaster.utils.TestingJobMasterGateway; import org.apache.flink.runtime.jobmaster.utils.TestingJobMasterGatewayBuilder; import org.apache.flink.runtime.messages.Acknowledge; import org.apache.flink.runtime.messages.StackTraceSampleResponse; -import org.apache.flink.runtime.taskexecutor.exceptions.PartitionException; +import org.apache.flink.runtime.taskexecutor.exceptions.PartitionUpdateException; import org.apache.flink.runtime.taskexecutor.slot.TaskSlotTable; import org.apache.flink.runtime.testtasks.BlockingNoOpInvokable; import org.apache.flink.util.ExceptionUtils; @@ -495,7 +495,7 @@ public class TaskExecutorSubmissionTest extends TestLogger { updateFuture.get(); fail(); } catch (Exception e) { - assertTrue(ExceptionUtils.findThrowable(e, PartitionException.class).isPresent()); + assertTrue(ExceptionUtils.findThrowable(e, PartitionUpdateException.class).isPresent()); } } }