sacct - add container field

Bug 11380

doc/man/man1/sacct.1

@@ -142,29 +142,30 @@ Account             AdminComment        AllocCPUS           AllocNodes
 AllocTRES           AssocID             AveCPU              AveCPUFreq
 AveDiskRead         AveDiskWrite        AvePages            AveRSS
 AveVMSize           BlockID             Cluster             Comment
-Constraints         ConsumedEnergy      ConsumedEnergyRaw   CPUTime
-CPUTimeRAW          DBIndex             DerivedExitCode     Elapsed
-ElapsedRaw          Eligible            End                 ExitCode
-Flags               GID                 Group               JobID
-JobIDRaw            JobName             Layout              MaxDiskRead
-MaxDiskReadNode     MaxDiskReadTask     MaxDiskWrite        MaxDiskWriteNode
-MaxDiskWriteTask    MaxPages            MaxPagesNode        MaxPagesTask
-MaxRSS              MaxRSSNode          MaxRSSTask          MaxVMSize
-MaxVMSizeNode       MaxVMSizeTask       McsLabel            MinCPU
-MinCPUNode          MinCPUTask          NCPUS               NNodes
-NodeList            NTasks              Priority            Partition
-QOS                 QOSRAW              Reason              ReqCPUFreq
-ReqCPUFreqMin       ReqCPUFreqMax       ReqCPUFreqGov       ReqCPUS
-ReqMem              ReqNodes            ReqTRES             Reservation
-ReservationId       Reserved            ResvCPU             ResvCPURAW
-Start               State               Submit              SubmitLine
-Suspended           SystemCPU           SystemComment       Timelimit
-TimelimitRaw        TotalCPU            TRESUsageInAve      TRESUsageInMax
-TRESUsageInMaxNode  TRESUsageInMaxTask  TRESUsageInMin      TRESUsageInMinNode
-TRESUsageInMinTask  TRESUsageInTot      TRESUsageOutAve     TRESUsageOutMax
-TRESUsageOutMaxNode TRESUsageOutMaxTask TRESUsageOutMin     TRESUsageOutMinNode
-TRESUsageOutMinTask TRESUsageOutTot     UID                 User
-UserCPU             WCKey               WCKeyID             WorkDir
+Constraints         Container           ConsumedEnergy      ConsumedEnergyRaw
+CPUTime             CPUTimeRAW          DBIndex             DerivedExitCode
+Elapsed             ElapsedRaw          Eligible            End
+ExitCode            Flags               GID                 Group
+JobID               JobIDRaw            JobName             Layout
+MaxDiskRead         MaxDiskReadNode     MaxDiskReadTask     MaxDiskWrite
+MaxDiskWriteNode    MaxDiskWriteTask    MaxPages            MaxPagesNode
+MaxPagesTask        MaxRSS              MaxRSSNode          MaxRSSTask
+MaxVMSize           MaxVMSizeNode       MaxVMSizeTask       McsLabel
+MinCPU              MinCPUNode          MinCPUTask          NCPUS
+NNodes              NodeList            NTasks              Priority
+Partition           QOS                 QOSRAW              Reason
+ReqCPUFreq          ReqCPUFreqMin       ReqCPUFreqMax       ReqCPUFreqGov
+ReqCPUS             ReqMem              ReqNodes            ReqTRES
+Reservation         ReservationId       Reserved            ResvCPU
+ResvCPURAW          Start               State               Submit
+SubmitLine          Suspended           SystemCPU           SystemComment
+Timelimit           TimelimitRaw        TotalCPU            TRESUsageInAve
+TRESUsageInMax      TRESUsageInMaxNode  TRESUsageInMaxTask  TRESUsageInMin
+TRESUsageInMinNode  TRESUsageInMinTask  TRESUsageInTot      TRESUsageOutAve
+TRESUsageOutMax     TRESUsageOutMaxNode TRESUsageOutMaxTask TRESUsageOutMin
+TRESUsageOutMinNode TRESUsageOutMinTask TRESUsageOutTot     UID
+User                UserCPU             WCKey               WCKeyID
+WorkDir
 .ft 1
 .fi
 .RE
@@ -560,6 +561,10 @@ Total energy consumed by all tasks in job, in joules.
 Note: Only in case of exclusive job allocation this value
 reflects the jobs' real energy consumption.
 
+.TP
+\f3Container\fP
+Path to OCI Container Bundle requested.
+
 .TP
 \f3CPUTime\fP
 Time used (Elapsed time * CPU count) by a job or step in HH:MM:SS format.

src/sacct/print.c

@@ -634,6 +634,23 @@ extern void print_fields(type_t type, void *object)
 					     tmp_char,
 					     (curr_inx == field_count));
 			break;
+		case PRINT_CONTAINER:
+			switch(type) {
+			case JOB:
+				tmp_char = job->container;
+				break;
+			case JOBSTEP:
+				tmp_char = step->container;
+				break;
+			case JOBCOMP:
+			default:
+				tmp_char = NULL;
+				break;
+			}
+			field->print_routine(field,
+					     tmp_char,
+					     (curr_inx == field_count));
+			break;
 		case PRINT_CONSUMED_ENERGY:
 			switch (type) {
 			case JOB:

src/sacct/sacct.c

@@ -59,6 +59,7 @@ print_field_t fields[] = {
 	{10, "Cluster", print_fields_str, PRINT_CLUSTER},
 	{14, "Comment", print_fields_str, PRINT_COMMENT},
 	{19, "Constraints", print_fields_str, PRINT_CONSTRAINTS},
+	{19, "Container", print_fields_str, PRINT_CONTAINER},
 	{14, "ConsumedEnergy", print_fields_str, PRINT_CONSUMED_ENERGY},
 	{17, "ConsumedEnergyRaw", print_fields_uint64,
 	 PRINT_CONSUMED_ENERGY_RAW},

src/sacct/sacct.h

@@ -105,6 +105,7 @@ typedef enum {
 		PRINT_CLUSTER,
 		PRINT_COMMENT,
 		PRINT_CONSTRAINTS,
+		PRINT_CONTAINER,
 		PRINT_CONSUMED_ENERGY,
 		PRINT_CONSUMED_ENERGY_RAW,
 		PRINT_CPU_TIME,