Merge pull request #463 from duhanmin/dev-1.0.1

解决schedules kill任务后EventcheckReceiver依旧在后台运行

Author: wushengyeyouya

dss-appconn/appconns/dss-eventchecker-appconn/src/main/scala/com/webank/wedatasphere/dss/appconn/eventchecker/execution/EventCheckerRefExecutionOperation.scala

@@ -38,7 +38,7 @@ class EventCheckerRefExecutionOperation  extends LongTermRefExecutionOperation w
 
   private var service:DevelopmentService = _
   private val logger = LoggerFactory.getLogger(classOf[EventCheckerRefExecutionOperation])
-
+  private var killTag = false
 
 
 
@@ -60,11 +60,14 @@ class EventCheckerRefExecutionOperation  extends LongTermRefExecutionOperation w
     }
   }
 
-  override def kill(action: RefExecutionAction): Boolean = action match {
-    case longTermAction: EventCheckerExecutionAction =>
-      longTermAction.setKilledFlag(true)
-      longTermAction.setState(RefExecutionState.Killed)
-      true
+  override def kill(action: RefExecutionAction): Boolean = {
+    killTag = true
+    action match {
+      case longTermAction: EventCheckerExecutionAction =>
+        longTermAction.setKilledFlag(true)
+        longTermAction.setState(RefExecutionState.Killed)
+        true
+    }
   }
 
   protected def putErrorMsg(errorMsg: String, t: Throwable, action: EventCheckerExecutionAction): EventCheckerExecutionAction = t match {
@@ -120,6 +123,10 @@ class EventCheckerRefExecutionOperation  extends LongTermRefExecutionOperation w
             putErrorMsg("EventChecker run failed!" + t.getMessage, t, action)
             false
           })
+          if(killTag) {
+            killTag = false
+            return RefExecutionState.Killed
+          }
         }
         action.state
       }