This is an automated email from the ASF dual-hosted git repository.
weiraowang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 6862fe7548 Removed unused StateEventHandleFailure (#16052)
6862fe7548 is described below
commit 6862fe7548f1b5fc83d416df9860d04ce058c06d
Author: Wenjun Ruan <[email protected]>
AuthorDate: Thu May 23 11:35:46 2024 +0800
Removed unused StateEventHandleFailure (#16052)
---
.../master/event/StateEventHandleFailure.java | 33 ----------------------
.../server/master/event/StateEventHandler.java | 3 +-
.../master/runner/WorkflowExecuteRunnable.java | 8 ------
3 files changed, 1 insertion(+), 43 deletions(-)
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandleFailure.java
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandleFailure.java
deleted file mode 100644
index 5e757c7858..0000000000
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandleFailure.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.dolphinscheduler.server.master.event;
-
-/**
- * This exception represent the exception can be recovered, when we get this
exception,
- * we will move the event to the fail of the queue.
- */
-public class StateEventHandleFailure extends Exception {
-
- public StateEventHandleFailure(String message) {
- super(message);
- }
-
- public StateEventHandleFailure(String message, Throwable throwable) {
- super(message, throwable);
- }
-}
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandler.java
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandler.java
index 08ee6b66c5..3e6f3d4ada 100644
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandler.java
+++
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEventHandler.java
@@ -28,10 +28,9 @@ public interface StateEventHandler {
* @param stateEvent given state event.
* @throws StateEventHandleException this exception means it can be
recovered.
* @throws StateEventHandleError this exception means it cannot be
recovered, so the event need to drop.
- * @throws StateEventHandleException this means it can be recovered.
*/
boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable,
- StateEvent stateEvent) throws
StateEventHandleException, StateEventHandleError, StateEventHandleFailure;
+ StateEvent stateEvent) throws
StateEventHandleException, StateEventHandleError;
StateEventType getEventType();
}
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
index 72c52922d7..f49462cdc8 100644
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
+++
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
@@ -65,7 +65,6 @@ import
org.apache.dolphinscheduler.server.master.config.MasterConfig;
import org.apache.dolphinscheduler.server.master.event.StateEvent;
import org.apache.dolphinscheduler.server.master.event.StateEventHandleError;
import
org.apache.dolphinscheduler.server.master.event.StateEventHandleException;
-import org.apache.dolphinscheduler.server.master.event.StateEventHandleFailure;
import org.apache.dolphinscheduler.server.master.event.StateEventHandler;
import
org.apache.dolphinscheduler.server.master.event.StateEventHandlerManager;
import org.apache.dolphinscheduler.server.master.event.TaskStateEvent;
@@ -298,13 +297,6 @@ public class WorkflowExecuteRunnable implements
IWorkflowExecuteRunnable {
stateEvent,
stateEventHandleException);
ThreadUtils.sleep(Constants.SLEEP_TIME_MILLIS);
- } catch (StateEventHandleFailure stateEventHandleFailure) {
- log.error("State event handle failed, will move event to the
tail: {}",
- stateEvent,
- stateEventHandleFailure);
- this.stateEvents.remove(stateEvent);
- this.stateEvents.offer(stateEvent);
- ThreadUtils.sleep(Constants.SLEEP_TIME_MILLIS);
} catch (Exception e) {
// we catch the exception here, since if the state event
handle failed, the state event will still
// keep
