Attachment #2642 for ticket #2242




		return "QOSMinBB";
	case FAIL_DEADLINE:
		return "DeadLine";
	case WAIT_QOS_MAX_BB_PER_ACCT:
		return "MaxBBPerAccount";
	case WAIT_QOS_MAX_CPU_PER_ACCT:
		return "MaxCpuPerAccount";
	case WAIT_QOS_MAX_ENERGY_PER_ACCT:
		return "MaxEnergyPerAccount";
	case WAIT_QOS_MAX_GRES_PER_ACCT:
		return "MaxGRESPerAccount";
	case WAIT_QOS_MAX_NODE_PER_ACCT:
		return "MaxNodePerAccount";
	case WAIT_QOS_MAX_LIC_PER_ACCT:
		return "MaxLicensePerAccount";
	case WAIT_QOS_MAX_MEM_PER_ACCT:
		return "MaxMemoryPerAccount";
	case WAIT_QOS_MAX_UNK_PER_ACCT:
		return "MaxUnknownPerAccount";
	case WAIT_QOS_MAX_JOB_PER_ACCT:
		return "MaxJobsPerAccount";
	case WAIT_QOS_MAX_SUB_JOB_PER_ACCT:
		return "MaxSubmitJobsPerAccount";
	default:
		snprintf(val, sizeof(val), "%d", inx);
		return val;

Lines 428-433 static print_field_t _get_print_field(char object) Link Here

(-)a/src/sacctmgr/common.c (+8 lines)
428	field->print_routine = sacctmgr_print_tres;	428	field->print_routine = sacctmgr_print_tres;
429	} else if (!strncasecmp("MaxTRESRunMinsPerAccount", object,	429	} else if (!strncasecmp("MaxTRESRunMinsPerAccount", object,
430	MAX(command_len, 18)) \|\|	430	MAX(command_len, 18)) \|\|
		431	!strncasecmp("MaxTRESRunMinsPerAcct", object,
		432	MAX(command_len, 18)) \|\|
431	!strncasecmp("MaxTRESRunMinsPA", object,	433	!strncasecmp("MaxTRESRunMinsPA", object,
432	MAX(command_len, 15))) {	434	MAX(command_len, 15))) {
433	field->type = PRINT_MAXTRMA;	435	field->type = PRINT_MAXTRMA;
Lines 444-449 static print_field_t _get_print_field(char object) Link Here
444	field->print_routine = sacctmgr_print_tres;	446	field->print_routine = sacctmgr_print_tres;
445	} else if (!strncasecmp("MaxTRESPerAccount", object,	447	} else if (!strncasecmp("MaxTRESPerAccount", object,
446	MAX(command_len, 11)) \|\|	448	MAX(command_len, 11)) \|\|
		449	!strncasecmp("MaxTRESPerAcct", object,
		450	MAX(command_len, 11)) \|\|
447	!strncasecmp("MaxTRESPA", object,	451	!strncasecmp("MaxTRESPA", object,
448	MAX(command_len, 9))) {	452	MAX(command_len, 9))) {
449	field->type = PRINT_MAXTA;	453	field->type = PRINT_MAXTA;
Lines 463-468 static print_field_t _get_print_field(char object) Link Here
463	field->print_routine = print_fields_uint;	467	field->print_routine = print_fields_uint;
464	} else if (!strncasecmp("MaxJobsPerAccount", object,	468	} else if (!strncasecmp("MaxJobsPerAccount", object,
465	MAX(command_len, 11)) \|\|	469	MAX(command_len, 11)) \|\|
		470	!strncasecmp("MaxJobsPerAcct", object,
		471	MAX(command_len, 11)) \|\|
466	!strncasecmp("MaxJobsPA", object,	472	!strncasecmp("MaxJobsPA", object,
467	MAX(command_len, 9))) {	473	MAX(command_len, 9))) {
468	field->type = PRINT_MAXJA;	474	field->type = PRINT_MAXJA;
Lines 498-503 static print_field_t _get_print_field(char object) Link Here
498	field->print_routine = print_fields_uint;	504	field->print_routine = print_fields_uint;
499	} else if (!strncasecmp("MaxSubmitJobsPerAccount", object,	505	} else if (!strncasecmp("MaxSubmitJobsPerAccount", object,
500	MAX(command_len, 17)) \|\|	506	MAX(command_len, 17)) \|\|
		507	!strncasecmp("MaxSubmitJobsPerAcct", object,
		508	MAX(command_len, 17)) \|\|
501	!strncasecmp("MaxSubmitJobsPA", object,	509	!strncasecmp("MaxSubmitJobsPA", object,
502	MAX(command_len, 15))) {	510	MAX(command_len, 15))) {
503	field->type = PRINT_MAXSA;	511	field->type = PRINT_MAXSA;

Lines 929-935 extern int sacctmgr_list_qos(int argc, char *argv[]) Link Here

(-)a/src/sacctmgr/qos_functions.c (-1 / +4 lines)
929	"MaxTRES,MaxTRESPerN,MaxTRESMins,MaxW,"	929	"MaxTRES,MaxTRESPerN,MaxTRESMins,MaxW,"
930	"MaxTRESPerUser,"	930	"MaxTRESPerUser,"
931	"MaxJobsPerUser,"	931	"MaxJobsPerUser,"
932	"MaxSubmitJobsPerUser,MinTRES");	932	"MaxSubmitJobsPerUser,"
		933	"MaxTRESPerAcct,"
		934	"MaxJobsPerAcct,"
		935	"MaxSubmitJobsPerAcct,MinTRES");
933	}	936	}
934		937
935	print_fields_list = sacctmgr_process_format_list(format_list);	938	print_fields_list = sacctmgr_process_format_list(format_list);

Return to ticket 2242

Lines 1603-1608 extern char *job_reason_string(enum job_state_reason inx) Link Here

(-)a/src/common/slurm_protocol_defs.c (+20 lines)
1603	return "QOSMinBB";	1603	return "QOSMinBB";
1604	case FAIL_DEADLINE:	1604	case FAIL_DEADLINE:
1605	return "DeadLine";	1605	return "DeadLine";
		1606	case WAIT_QOS_MAX_BB_PER_ACCT:
		1607	return "MaxBBPerAccount";
		1608	case WAIT_QOS_MAX_CPU_PER_ACCT:
		1609	return "MaxCpuPerAccount";
		1610	case WAIT_QOS_MAX_ENERGY_PER_ACCT:
		1611	return "MaxEnergyPerAccount";
		1612	case WAIT_QOS_MAX_GRES_PER_ACCT:
		1613	return "MaxGRESPerAccount";
		1614	case WAIT_QOS_MAX_NODE_PER_ACCT:
		1615	return "MaxNodePerAccount";
		1616	case WAIT_QOS_MAX_LIC_PER_ACCT:
		1617	return "MaxLicensePerAccount";
		1618	case WAIT_QOS_MAX_MEM_PER_ACCT:
		1619	return "MaxMemoryPerAccount";
		1620	case WAIT_QOS_MAX_UNK_PER_ACCT:
		1621	return "MaxUnknownPerAccount";
		1622	case WAIT_QOS_MAX_JOB_PER_ACCT:
		1623	return "MaxJobsPerAccount";
		1624	case WAIT_QOS_MAX_SUB_JOB_PER_ACCT:
		1625	return "MaxSubmitJobsPerAccount";
1606	default:	1626	default:
1607	snprintf(val, sizeof(val), "%d", inx);	1627	snprintf(val, sizeof(val), "%d", inx);
1608	return val;	1628	return val;