fix bug

Author: 1daidai1

internal/cacct/cacct.go

@@ -243,7 +243,7 @@ func QueryJob() util.CraneCmdError {
 				taskInfo.Name,
 				taskInfo.Partition,
 				taskInfo.Account,
-				strconv.FormatFloat(taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit*float64(taskInfo.NodeNum), 'f', 2, 64),
+				strconv.FormatFloat(taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit, 'f', 2, 64),
 				taskInfo.Status.String(),
 				exitCode}
 		}
@@ -328,7 +328,7 @@ func ProcessReqCPUs(task *protos.TaskInfo) string {
 
 // AllocCPUs (c)
 func ProcessAllocCPUs(task *protos.TaskInfo) string {
-	return strconv.FormatFloat(task.AllocatedResView.AllocatableRes.CpuCoreLimit*float64(task.NodeNum), 'f', 2, 64)
+	return strconv.FormatFloat(task.AllocatedResView.AllocatableRes.CpuCoreLimit, 'f', 2, 64)
 }
 
 // ElapsedTime (D)
@@ -411,8 +411,12 @@ func ProcessReqMemPerNode(task *protos.TaskInfo) string {
 }
 
 // AllocMemPerNode (m)
-func ProcessAllocMemPerNode(task *protos.TaskInfo) string {	
-   return util.FormatMemToMB(task.AllocatedResView.AllocatableRes.MemoryLimitBytes)
+func ProcessAllocMemPerNode(task *protos.TaskInfo) string {
+	if task.NodeNum == 0 {
+		return "0M"
+	}
+	allocMemPerNode := task.AllocatedResView.AllocatableRes.MemoryLimitBytes / uint64(task.NodeNum)
+    return util.FormatMemToMB(allocMemPerNode)
 }
 
 // NodeNum (N)

internal/ccontrol/ccontrol.go

@@ -428,8 +428,8 @@ func ShowJobs(jobIds string, queryAll bool) util.CraneCmdError {
 			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.AllocatedResView.AllocatableRes.CpuCoreLimit*float64(taskInfo.NodeNum),
-			util.FormatMemToMB(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes*uint64(taskInfo.NodeNum)),
+			taskInfo.NodeNum, taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit,
+			util.FormatMemToMB(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes),
 			formatDeviceMap(taskInfo.AllocatedResView.DeviceMap),
 			formatHostNameStr(util.HostNameListToStr(taskInfo.GetReqNodes())),
 			formatHostNameStr(util.HostNameListToStr(taskInfo.GetExcludeNodes())),

internal/ceff/ceff.go

@@ -333,14 +333,17 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 		fmt.Printf("JobState: %v (exit code %d)\n", taskInfo.Status.String(), taskInfo.ExitCode)
 	}
 
-	cpuTotal := taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit * float64(taskInfo.NodeNum)
+	if taskInfo.NodeNum == 0 {
+		return fmt.Errorf("the number of nodes is empty")
+	}
+	cpuTotal := taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit
 	if math.Abs(cpuTotal-1) < 1e-9 {
 		fmt.Printf("Cores: %.2f\n", cpuTotal)
 	} else {
 		fmt.Printf(
 			"Nodes: %v\n"+
 				"Cores per node: %.2f\n",
-			taskInfo.NodeNum, taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit)
+			taskInfo.NodeNum, cpuTotal / float64(taskInfo.NodeNum))
 	}
 
 	if taskInfo.Status == protos.TaskStatus_Pending {
@@ -361,8 +364,9 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := float64(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes) / (1024 * 1024)
-	totalMallocMemMb := mallocMemMbPerNode * float64(taskInfo.NodeNum)
+	mallocMemMbPerNode := float64(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes) /
+		 float64(taskInfo.NodeNum) / (1024 * 1024)
+	totalMallocMemMb := float64(taskInfo.ReqResView.AllocatableRes.MemoryLimitBytes)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100
 	}
@@ -398,7 +402,11 @@ func PrintTaskInfoInJson(taskInfo *protos.TaskInfo, records []*ResourceUsageReco
 		return nil, fmt.Errorf("failed to get groupname for GID %d: %w", taskInfo.Gid, err)
 	}
 
-	cpuTotal := taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit * float64(taskInfo.NodeNum)
+	if taskInfo.NodeNum == 0 {
+		return nil, fmt.Errorf("the number of nodes is empty")
+	}
+	cpuTotal := taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit
+	coresPerNode := cpuTotal / float64(taskInfo.NodeNum)
 	taskJsonInfo := &CeffTaskInfo{
 		JobID:        taskInfo.TaskId,
 		QoS:          taskInfo.Qos,
@@ -409,7 +417,7 @@ func PrintTaskInfoInJson(taskInfo *protos.TaskInfo, records []*ResourceUsageReco
 		Account:      taskInfo.Account,
 		JobState:     taskInfo.Status,
 		Nodes:        taskInfo.NodeNum,
-		CoresPerNode: taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit,
+		CoresPerNode: coresPerNode,
 	}
 
 	if taskInfo.Status == protos.TaskStatus_Pending {
@@ -430,8 +438,9 @@ func PrintTaskInfoInJson(taskInfo *protos.TaskInfo, records []*ResourceUsageReco
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := float64(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes) / (1024 * 1024)
-	totalMallocMemMb := mallocMemMbPerNode * float64(taskInfo.NodeNum)
+	mallocMemMbPerNode := float64(taskInfo.ReqResView.AllocatableRes.MemoryLimitBytes) /
+				 float64(taskInfo.NodeNum) / (1024 * 1024)
+	totalMallocMemMb := float64(taskInfo.ReqResView.AllocatableRes.MemoryLimitBytes)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100
 	}

internal/cqueue/cqueue.go

@@ -300,7 +300,7 @@ func ProcessAccount(task *protos.TaskInfo) string {
 
 // 'c' group
 func ProcessAllocCpus(task *protos.TaskInfo) string {
-	return strconv.FormatFloat(task.AllocatedResView.AllocatableRes.CpuCoreLimit * float64(task.NodeNum), 'f', 2, 64)
+	return strconv.FormatFloat(task.AllocatedResView.AllocatableRes.CpuCoreLimit, 'f', 2, 64)
 }
 
 // 'C' group
@@ -348,7 +348,11 @@ func ProcessNodeList(task *protos.TaskInfo) string {
 
 // 'm' group
 func ProcessAllocMemPerNode(task *protos.TaskInfo) string {
-   return util.FormatMemToMB(task.AllocatedResView.AllocatableRes.MemoryLimitBytes)
+	if task.NodeNum == 0 {
+		return "0M"
+   	}
+   	return util.FormatMemToMB(task.AllocatedResView.AllocatableRes.MemoryLimitBytes /
+			uint64(task.NodeNum))
 }
 
 // 'M' group