fix bug

Author: 1daidai1

internal/cacct/cacct.go

@@ -412,8 +412,8 @@ func ProcessReqMemPerNode(task *protos.TaskInfo) string {
 
 // AllocMemPerNode (m)
 func ProcessAllocMemPerNode(task *protos.TaskInfo) string {
-	if task.ReqResView.AllocatableRes == nil {
-		return "unkown"
+	if task.NodeNum == 0 {
+		return "0"
    }
    return strconv.FormatUint(task.AllocMemTotal / uint64(task.NodeNum) /(1024*1024), 10)
 }

internal/ccontrol/ccontrol.go

@@ -359,7 +359,9 @@ func ShowJobs(jobIds string, queryAll bool) util.CraneCmdError {
 			formatHostNameStr(util.HostNameListToStr(taskInfo.GetExecutionNode())),
 			taskInfo.CmdLine, taskInfo.Cwd,
 			taskInfo.Priority, taskInfo.Qos, taskInfo.ReqResView.AllocatableRes.CpuCoreLimit, util.FormatMemToMB(taskInfo.ReqResView.AllocatableRes.MemoryLimitBytes),
-			taskInfo.NodeNum, taskInfo.ReqResView.AllocatableRes.CpuCoreLimit*float64(taskInfo.NodeNum), formatDeviceMap(taskInfo.ReqResView.DeviceMap),
+			taskInfo.NodeNum, taskInfo.ReqResView.AllocatableRes.CpuCoreLimit*float64(taskInfo.NodeNum),
+			util.FormatMemToMB(taskInfo.ReqResView.AllocatableRes.MemoryLimitBytes*uint64(taskInfo.NodeNum)),
+			formatDeviceMap(taskInfo.ReqResView.DeviceMap),
 			taskInfo.NodeNum, taskInfo.AllocCpusTotal, util.FormatMemToMB(taskInfo.AllocMemTotal), taskInfo.AllocDeviceTotal,
 			formatHostNameStr(util.HostNameListToStr(taskInfo.GetReqNodes())), formatHostNameStr(util.HostNameListToStr(taskInfo.GetExcludeNodes())),
 			formatJobComment(taskInfo.ExtraAttr), strconv.FormatBool(taskInfo.Exclusive),

internal/ceff/ceff.go

@@ -361,7 +361,12 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := float64(taskInfo.AllocMemTotal) / float64(taskInfo.NodeNum) / (1024 * 1024)
+	mallocMemMbPerNode := 0.0
+	if taskInfo.NodeNum == 0 {
+		return fmt.Errorf("Node num empty")
+	} else {
+		mallocMemMbPerNode = float64(taskInfo.AllocMemTotal) / float64(taskInfo.NodeNum) / (1024 * 1024)
+	}
 	totalMallocMemMb := float64(taskInfo.AllocMemTotal)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100

internal/cqueue/cqueue.go

@@ -348,6 +348,9 @@ func ProcessNodeList(task *protos.TaskInfo) string {
 
 // 'm' group
 func ProcessAllocMemPerNode(task *protos.TaskInfo) string {
+	if task.NodeNum == 0 {
+		return "0"
+   }
 	return strconv.FormatUint(task.AllocMemTotal / uint64(task.NodeNum) / (1024*1024) , 10)
 }