fix bug

Author: 1daidai1

internal/cacct/cacct.go

@@ -321,7 +321,7 @@ func ProcessAccount(task *protos.TaskInfo) string {
 	return task.Account
 }
 
-// ReqCPUs
+// ReqCPUs (C)
 func ProcessReqCPUs(task *protos.TaskInfo) string {
 	return strconv.FormatFloat(task.ReqResView.AllocatableRes.CpuCoreLimit*float64(task.NodeNum), 'f', 2, 64)
 }
@@ -557,8 +557,8 @@ var fieldProcessors = map[string]FieldProcessor{
 	"reqmempernode": {"ReqMemPerNode", ProcessReqMemPerNode},
 
 	// Group m
-	"m":          {"AllocMemPerNode", ProcessAllocMemPerNode},
-	"mempernode": {"AllocMemPerNode", ProcessAllocMemPerNode},
+	"m":               {"AllocMemPerNode", ProcessAllocMemPerNode},
+	"allocmempernode": {"AllocMemPerNode", ProcessAllocMemPerNode},
 
 	// Group N
 	"N":       {"NodeNum", ProcessNodeNum},

internal/ccontrol/ccontrol.go

@@ -341,6 +341,11 @@ func ShowJobs(jobIds string, queryAll bool) util.CraneCmdError {
 			return util.ErrorGeneric
 		}
 
+		allocDeviceTotal := "None"
+		if len(taskInfo.AllocDeviceTotal) != 0 {
+			allocDeviceTotal = taskInfo.AllocDeviceTotal
+		}
+
 		printed[taskInfo.TaskId] = true
 
 		fmt.Printf("JobId=%v JobName=%v\n"+
@@ -352,7 +357,7 @@ func ShowJobs(jobIds string, queryAll bool) util.CraneCmdError {
 			"\tReqRes=node=%d cpu=%.2f mem=%v gres=%s\n"+
 			"\tAllocRes=node=%d cpu=%.2f mem=%v gres=%s\n"+
 			"\tReqNodeList=%v ExecludeNodeList=%v\n"+
-			"\tComment=%v Exclusive=%v\n",
+			"\tExclusive=%v Comment=%v\n",
 			taskInfo.TaskId, taskInfo.Name, craneUser.Username, taskInfo.Uid, group.Name, taskInfo.Gid,
 			taskInfo.Account, taskInfo.Status.String(), runTimeStr, timeLimitStr, timeSubmitStr,
 			timeStartStr, timeEndStr, taskInfo.Partition, formatHostNameStr(taskInfo.GetCranedList()),
@@ -362,9 +367,9 @@ 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.AllocCpusTotal, util.FormatMemToMB(taskInfo.AllocMemTotal), taskInfo.AllocDeviceTotal,
+			taskInfo.NodeNum, taskInfo.AllocCpusTotal, util.FormatMemToMB(taskInfo.AllocMemTotal), allocDeviceTotal,
 			formatHostNameStr(util.HostNameListToStr(taskInfo.GetReqNodes())), formatHostNameStr(util.HostNameListToStr(taskInfo.GetExcludeNodes())),
-			formatJobComment(taskInfo.ExtraAttr), strconv.FormatBool(taskInfo.Exclusive),
+			strconv.FormatBool(taskInfo.Exclusive), formatJobComment(taskInfo.ExtraAttr),
 		)
 	}
 

internal/ceff/ceff.go

@@ -333,6 +333,9 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 		fmt.Printf("JobState: %v (exit code %d)\n", taskInfo.Status.String(), taskInfo.ExitCode)
 	}
 
+	if taskInfo.NodeNum == 0 {
+		return fmt.Errorf("the number of nodes is empty")
+	}
 	cpuTotal := taskInfo.AllocCpusTotal
 	if math.Abs(cpuTotal-1) < 1e-9 {
 		fmt.Printf("Cores: %.2f\n", cpuTotal)
@@ -361,12 +364,7 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := 0.0
-	if taskInfo.NodeNum == 0 {
-		return fmt.Errorf("Node num empty")
-	} else {
-		mallocMemMbPerNode = float64(taskInfo.AllocMemTotal) / float64(taskInfo.NodeNum) / (1024 * 1024)
-	}
+	mallocMemMbPerNode := float64(taskInfo.AllocMemTotal) / float64(taskInfo.NodeNum) / (1024 * 1024)
 	totalMallocMemMb := float64(taskInfo.AllocMemTotal)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100
@@ -403,6 +401,9 @@ func PrintTaskInfoInJson(taskInfo *protos.TaskInfo, records []*ResourceUsageReco
 		return nil, fmt.Errorf("failed to get groupname for GID %d: %w", taskInfo.Gid, err)
 	}
 
+	if taskInfo.NodeNum == 0 {
+		return nil, fmt.Errorf("the number of nodes is empty")
+	}
 	cpuTotal := taskInfo.AllocCpusTotal
 	coresPerNode := cpuTotal / float64(taskInfo.NodeNum)
 	taskJsonInfo := &CeffTaskInfo{
@@ -436,8 +437,8 @@ func PrintTaskInfoInJson(taskInfo *protos.TaskInfo, records []*ResourceUsageReco
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := cpuTotal / float64(taskInfo.NodeNum) / (1024 * 1024)
-	totalMallocMemMb := mallocMemMbPerNode * float64(taskInfo.NodeNum)
+	mallocMemMbPerNode := float64(taskInfo.AllocMemTotal) / float64(taskInfo.NodeNum) / (1024 * 1024)
+	totalMallocMemMb := float64(taskInfo.AllocMemTotal)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100
 	}

internal/cqueue/cqueue.go

@@ -382,7 +382,7 @@ func ProcessQoS(task *protos.TaskInfo) string {
 	return task.Qos
 }
 
-// 'Q' group
+// 'Q' groupProcessReqCpus
 func ProcessReqCPUs(task *protos.TaskInfo) string {
 	return strconv.FormatFloat(task.ReqResView.AllocatableRes.CpuCoreLimit*float64(task.NodeNum), 'f', 2, 64)
 }
@@ -455,10 +455,10 @@ var fieldMap = map[string]FieldProcessor{
 	"account": {"Account", ProcessAccount},
 
 	// 'c' group
-	"c":          {"ReqCpuPerNode", ProcessReqCpuPerNode},
-	"cpupernode": {"ReqCpuPerNode", ProcessReqCpuPerNode},
-	"C":          {"AllocCpus", ProcessAllocCpus},
-	"alloccpus":  {"AllocCpus", ProcessAllocCpus},
+	"c":             {"ReqCpuPerNode", ProcessReqCpuPerNode},
+	"reqcpupernode": {"ReqCpuPerNode", ProcessReqCpuPerNode},
+	"C":             {"AllocCpus", ProcessAllocCpus},
+	"alloccpus":     {"AllocCpus", ProcessAllocCpus},
 
 	// 'e' group
 	"e":           {"ElapsedTime", ProcessElapsedTime},
@@ -483,10 +483,10 @@ var fieldMap = map[string]FieldProcessor{
 	"nodelist":  {"NodeList(Reason)", ProcessNodeList},
 
 	// 'm' group
-	"m":             {"AllocMemPerNode", ProcessAllocMemPerNode},
-	"mempernode":    {"AllocMemPerNode", ProcessAllocMemPerNode},
-	"M":             {"ReqMemPerNode", ProcessReqMemPerNode},
-	"reqmempernode": {"ReqMemPerNode", ProcessReqMemPerNode},
+	"m":               {"AllocMemPerNode", ProcessAllocMemPerNode},
+	"allocmempernode": {"AllocMemPerNode", ProcessAllocMemPerNode},
+	"M":               {"ReqMemPerNode", ProcessReqMemPerNode},
+	"reqmempernode":   {"ReqMemPerNode", ProcessReqMemPerNode},
 
 	// 'n' group
 	"n":       {"Name", ProcessName},
@@ -501,8 +501,10 @@ var fieldMap = map[string]FieldProcessor{
 	"partition": {"Partition", ProcessPartition},
 
 	// 'q' group
-	"q":   {"QoS", ProcessQoS},
-	"qos": {"QoS", ProcessQoS},
+	"q":       {"QoS", ProcessQoS},
+	"qos":     {"QoS", ProcessQoS},
+	"Q":       {"ReqCpus", ProcessReqCPUs},
+	"reqcpus": {"ReqCpus", ProcessReqCPUs},
 
 	// 'r' group
 	"r":        {"ReqNodes", ProcessReqNodes},