fix comments

Author: 1daidai1

internal/cacct/CmdArgParser.go

@@ -117,8 +117,8 @@ Fields are identified by a percent sign (%) followed by a character or string.
 Use a dot (.) and a number between % and the format character or string to specify a minimum width for the field. 
 Supported format identifiers or string, string case insensitive:
 	%a/%Account           - Display the account associated with the job.
-	%c/%AllocCpus         - Display the number of allocated CPUs, formatted to two decimal places.
 	%C/%ReqCpus           - Display the number of requested CPUs, formatted to two decimal places
+	%c/%AllocCpus         - Display the number of allocated CPUs, formatted to two decimal places.
 	%D/%ElapsedTime       - Display the elapsed time from the start of the job.
 	%E/%EndTime           - Display the end time of the job.
 	%e/%ExitCode          - Display the exit code of the job. 

internal/cbatch/cbatch.go

@@ -252,6 +252,9 @@ func ProcessCbatchArgs(cmd *cobra.Command, args []CbatchArg) (bool, *protos.Task
 	if FlagComment != "" {
 		structExtraFromCli.Comment = FlagComment
 	}
+	if FlagExclusive {
+		task.Exclusive = true
+	}
 	if FlagOpenMode != "" {
 		if FlagOpenMode == util.OpenModeAppend {
 			task.GetBatchMeta().OpenModeAppend = proto.Bool(true)

internal/cqueue/CmdArgParser.go

@@ -114,8 +114,8 @@ func init() {
 	
 Supported format identifiers or string, string case insensitive:
 	%a/%Account            - Display the account associated with the job.
-	%C/%AllocCpus          - Display the cpus allocated to the job.
-	%c/%CpuPerNode         - Display the requested cpu per node of the job.
+	%C/%ReqCpus            - Display the cpus requested to the job.
+	%c/%AllocCpus          - Display the cpus allocated to the job.
 	%e/%ElapsedTime        - Display the elapsed time from the start of the job. 
 	%h/%Held               - Display the hold state of the job.
 	%j/%JobID              - Display the ID of the job.
@@ -128,7 +128,7 @@ Supported format identifiers or string, string case insensitive:
 	%n/%Name               - Display the name of the job.
 	%P/%Partition          - Display the partition the job is running in.
 	%p/%Priority           - Display the priority of the job.
-	%Q/%ReqCpus            - Display the cpus requested to the job.
+	%Q/%CpuPerNode         - Display the requested cpu per node of the job.
 	%q/%QoS                - Display the Quality of Service level for the job.
 	%R/%Reason             - Display the reason of pending.
 	%r/%ReqNodes           - Display the reqnodes of the job.

internal/cqueue/cqueue.go

@@ -455,10 +455,11 @@ var fieldMap = map[string]FieldProcessor{
 	"account": {"Account", ProcessAccount},
 
 	// 'c' group
-	"c":             {"ReqCpuPerNode", ProcessReqCpuPerNode},
-	"reqcpupernode": {"ReqCpuPerNode", ProcessReqCpuPerNode},
-	"C":             {"AllocCpus", ProcessAllocCpus},
+	"c":             {"AllocCpus", ProcessAllocCpus},
 	"alloccpus":     {"AllocCpus", ProcessAllocCpus},
+	"C":             {"ReqCpus", ProcessReqCPUs},
+	"reqcpus":       {"ReqCpus", ProcessReqCPUs},
+
 
 	// 'e' group
 	"e":           {"ElapsedTime", ProcessElapsedTime},
@@ -503,8 +504,8 @@ var fieldMap = map[string]FieldProcessor{
 	// 'q' group
 	"q":       {"QoS", ProcessQoS},
 	"qos":     {"QoS", ProcessQoS},
-	"Q":       {"ReqCpus", ProcessReqCPUs},
-	"reqcpus": {"ReqCpus", ProcessReqCPUs},
+	"Q":             {"ReqCpuPerNode", ProcessReqCpuPerNode},
+	"reqcpupernode": {"ReqCpuPerNode", ProcessReqCpuPerNode},
 
 	// 'r' group
 	"r":        {"ReqNodes", ProcessReqNodes},
@@ -594,14 +595,14 @@ func FormatData(reply *protos.QueryTasksInfoReply) (header []string, tableData [
 			field = strings.ToLower(field)
 		}
 
-		//a/Account, c/ReqCpuPerNode, C/AllocCPUs, e/ElapsedTime, h/Held, j/JobID, l/TimeLimit, L/NodeList, k/Comment,
-		//m/AllocMemPerNode, M/ReqMemPerNode, n/Name, N/NodeNum, p/Priority, P/Partition, q/Qos, Q/ReqCpus, r/ReqNodes,
+		//a/Account, C/ReqCpus, c/AllocCPUs, e/ElapsedTime, h/Held, j/JobID, l/TimeLimit, L/NodeList, k/Comment,
+		//m/AllocMemPerNode, M/ReqMemPerNode, n/Name, N/NodeNum, p/Priority, P/Partition, q/Qos, Q/ReqCpuPerNode, r/ReqNodes,
 		//R/Reason, s/SubmitTime, S/StartTime, t/State, T/JobType, u/User, U/Uid, x/ExcludeNodes, X/Exclusive.
 		fieldProcessor, found := fieldMap[field]
 		if !found {
 			log.Errorf("Invalid format specifier or string : %s, string unfold case insensitive, reference:\n"+
-				"a/Account, c/ReqCpuPerNode, C/AllocCPUs, e/ElapsedTime, h/Held, j/JobID, l/TimeLimit, L/NodeList, k/Comment,\n"+
-				"m/AllocMemPerNode, M/ReqMemPerNode, n/Name, N/NodeNum, p/Priority, P/Partition, q/Qos, Q/ReqCpus, r/ReqNodes,\n"+
+				"a/Account, C/ReqCpus, c/AllocCPUs, e/ElapsedTime, h/Held, j/JobID, l/TimeLimit, L/NodeList, k/Comment,\n"+
+				"m/AllocMemPerNode, M/ReqMemPerNode, n/Name, N/NodeNum, p/Priority, P/Partition, q/Qos, Q/ReqCpuPerNode, r/ReqNodes,\n"+
 				"R/Reason, s/SubmitTime, S/StartTime, t/State, T/JobType, u/User, U/Uid, x/ExcludeNodes, X/Exclusive.", field)
 			os.Exit(util.ErrorInvalidFormat)
 		}