From 3c40765c22bca40384eda5bfa9f48f292458028e Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Tue, 26 May 2020 09:03:21 +0800
Subject: [PATCH] bugfix

---
 src/job_manager.go   | 11 +++++++++++
 src/resource_pool.go |  3 ---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/job_manager.go b/src/job_manager.go
index 1e5190a..ac98a4b 100644
--- a/src/job_manager.go
+++ b/src/job_manager.go
@@ -179,6 +179,13 @@ func (jm *JobManager) checkStatus(status []TaskStatus) {
 				onlyPS = false
 			}
 			InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
+		} else if status[i].Status == "unknown" {
+			log.Warn(jm.job.Name, "-", i, " is unknown")
+			flagRunning = true
+			if !jm.job.Tasks[i].IsPS {
+				onlyPS = false
+			}
+			//InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
 		} else {
 			log.Info(jm.job.Name, "-", i, " ", status[i].Status)
 			if exitCode, ok := status[i].State["ExitCode"].(float64); ok && exitCode != 0 && !jm.killFlag {
@@ -272,6 +279,10 @@ func (jm *JobManager) status() MsgJobStatus {
 			tasksStatus[i] = TaskStatus{Status: "unknown", State: map[string]interface{}{"ExitCode": float64(-1)}}
 			continue
 		}
+		if res.Code != 0 {
+			tasksStatus[i] = TaskStatus{Status: "notexist", State: map[string]interface{}{"ExitCode": float64(1)}}
+			continue
+		}
 		res.Status.Node = taskStatus.Node
 		tasksStatus[i] = res.Status
 	}
diff --git a/src/resource_pool.go b/src/resource_pool.go
index ce95210..93b4bd4 100644
--- a/src/resource_pool.go
+++ b/src/resource_pool.go
@@ -147,9 +147,6 @@ func (pool *ResourcePool) checkDeadNodes() {
 				seg = seg.Next
 			}
 			seg.Lock.Lock()
-			if seg.Nodes == nil {
-				seg = seg.Next
-			}
 			delete(seg.Nodes, v)
 			seg.Lock.Unlock()
 			delete(pool.heartBeat, v)