[YUNIKORN-579] Handle release allocation/ask events under Failing sta…

…te (#244)
apache · Mar 18, 2021 · 1b25b2c · 1b25b2c
1 parent d31b87e
commit 1b25b2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/cache/application.go b/pkg/cache/application.go
@@ -105,9 +105,15 @@ func NewApplication(appID, queueName, user string, tags map[string]string, sched
 			{Name: string(events.ReleaseAppAllocation),
 				Src: []string{states.Running},
 				Dst: states.Running},
+			{Name: string(events.ReleaseAppAllocation),
+				Src: []string{states.Failed},
+				Dst: states.Failed},
 			{Name: string(events.ReleaseAppAllocationAsk),
 				Src: []string{states.Running, states.Accepted, states.Reserving},
 				Dst: states.Running},
+			{Name: string(events.ReleaseAppAllocationAsk),
+				Src: []string{states.Failed},
+				Dst: states.Failed},
 			{Name: string(events.CompleteApplication),
 				Src: []string{states.Running},
 				Dst: states.Completed},

diff --git a/pkg/callback/scheduler_callback.go b/pkg/callback/scheduler_callback.go
@@ -131,7 +131,6 @@ func (callback *AsyncRMCallback) RecvUpdateResponse(response *si.UpdateResponse)
 		log.Logger().Debug("callback: response to released allocations",
 			zap.String("allocation key", ask.Allocationkey))
 
-		// TerminationType 0 mean STOPPED_BY_RM
 		if ask.TerminationType == si.TerminationType_TIMEOUT {
 			ev := cache.NewReleaseAppAllocationAskEvent(ask.ApplicationID, ask.TerminationType, ask.Allocationkey)
 			dispatcher.Dispatch(ev)
@@ -150,7 +149,7 @@ func (callback *AsyncRMCallback) RecvUpdateResponse(response *si.UpdateResponse)
 				log.Logger().Error("failed to delete application", zap.Error(err))
 			}
 		} else {
-			if updated.State == events.States().Application.Killed {
+			if updated.State == "Failing" || updated.State == events.States().Application.Failed {
 				ev := cache.NewFailApplicationEvent(updated.ApplicationID)
 				dispatcher.Dispatch(ev)
 			}