Attachment #22147 for ticket #12796

Lines 6-11 documents those changes that are of interest to users and administrators. Link Here

(-)a/NEWS (+2 lines)
6	-- Fix potential deadlock when using PMI v1.	6	-- Fix potential deadlock when using PMI v1.
7	-- Fix tight loop sending DBD_SEND_MULT_JOB_START when the slurmctld has an	7	-- Fix tight loop sending DBD_SEND_MULT_JOB_START when the slurmctld has an
8	issue talking correctly to the DBD.	8	issue talking correctly to the DBD.
		9	-- openapi/dbv0.0.37 - Add several missing fields in "dbv0.0.37_association"
		10	schema. Moved misnamed 'max/tres/total" to 'max/tres/group/total'.
9		11
10	* Changes in Slurm 21.08.3	12	* Changes in Slurm 21.08.3
11	==========================	13	==========================




</tr>
</table>

<h4>Move association field</h4>
<table class="tchange">
<tr class="trchange">
	<td class="tdfield">previous path</td>
	<td class="tdchange">
			.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.total
	</td>
</tr>
<tr class="trchange">
	<td class="tdfield">new path</td>
	<td class="tdchange">
			.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.total
	</td>
</tr>
</table>

<h4>Add association fields</h4>
<table class="tchange">
<tr class="trchange">
	<td class="tdfield">new fields</td>
	<td class="tdchange" colspan=2>
		<ul>
			<li>.components.schemas."dbv0.0.37_association".properties.is_default</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.active</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.accruing</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.active</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.minutes</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.total</li>
		</ul>
	</td>
</tr>
</table>

<h3>openapi/dbv0.0.37 (src/plugins/openapi/dbv0.0.37/openapi.json)</h3>

<h4>Correct placement of step TRES</h4>

Lines 1991-1996 Link Here

(-)a/src/plugins/openapi/dbv0.0.37/openapi.json (+37 lines)
1991	"description": "String of property name"	1991	"description": "String of property name"
1992	}	1992	}
1993	},	1993	},
		1994	"is_default": {
		1995	"type": "integer",
		1996	"description": "is default association"
		1997	},
1994	"max": {	1998	"max": {
1995	"type": "object",	1999	"type": "object",
1996	"description": "Max settings",	2000	"description": "Max settings",
Lines 1999-2004 Link Here
1999	"type": "object",	2003	"type": "object",
2000	"description": "Max jobs settings",	2004	"description": "Max jobs settings",
2001	"properties": {	2005	"properties": {
		2006	"active": {
		2007	"type": "integer",
		2008	"description": "Max active total jobs"
		2009	},
		2010	"accruing": {
		2011	"type": "integer",
		2012	"description": "Max job accruing priority"
		2013	},
		2014	"total": {
		2015	"type": "integer",
		2016	"description": "Max job total submitted"
		2017	},
2002	"per": {	2018	"per": {
2003	"type": "object",	2019	"type": "object",
2004	"description": "Max jobs per settings",	2020	"description": "Max jobs per settings",
Lines 2031-2036 Link Here
2031	"type": "object",	2047	"type": "object",
2032	"description": "Max TRES settings",	2048	"description": "Max TRES settings",
2033	"properties": {	2049	"properties": {
		2050	"group": {
		2051	"type": "object",
		2052	"description": "association specific limits",
		2053	"properties": {
		2054	"active": {
		2055	"type": "integer",
		2056	"description": "Max association total jobs"
		2057	},
		2058	"minutes": {
		2059	"type": "integer",
		2060	"description": "Max association minutes total"
		2061	},
		2062	"total": {
		2063	"type": "integer",
		2064	"description": "Max association total"
		2065	}
		2066	}
		2067	},
2034	"per": {	2068	"per": {
2035	"type": "object",	2069	"type": "object",
2036	"description": "Max TRES per settings",	2070	"description": "Max TRES per settings",
Lines 2050-2055 Link Here
2050	"type": "object",	2084	"type": "object",
2051	"description": "Max TRES minutes settings",	2085	"description": "Max TRES minutes settings",
2052	"properties": {	2086	"properties": {
		2087	"active": {
		2088	"$ref": "#/components/schemas/dbv0.0.37_tres_list"
		2089	},
2053	"per": {	2090	"per": {
2054	"type": "object",	2091	"type": "object",
2055	"description": "Max TRES minutes per settings",	2092	"description": "Max TRES minutes per settings",




	_add_parse(UINT32, grp_jobs, "max/jobs/per/count"),
	_add_parse(UINT32, grp_jobs_accrue, "max/jobs/per/accruing"),
	_add_parse(UINT32, grp_submit_jobs, "max/jobs/per/submitted"),
	_add_parse(TRES_LIST, grp_tres, "max/tres/group/total"),
	/* skipping gres_tres_ctld  (not packed) */
	_add_parse(TRES_LIST, grp_tres_mins, "max/tres/group/minutes"),
	/* skipping grp_tres_mins_ctld (not packed) */
	_add_parse(TRES_LIST, grp_tres_run_mins, "max/tres/group/active"),
	/* skipping grp_tres_run_mins_ctld (not packed) */
	/* skipping max_tres_mins_ctld */
	_add_parse(UINT32, grp_wall, "max/per/account/wall_clock"),
	/* skipping id */
	_add_parse(UINT16, is_def, "is_default"),
	/* skipping lft */
	_add_parse(UINT32, max_jobs, "max/jobs/active"),
	_add_parse(UINT32, max_jobs_accrue, "max/jobs/accruing"),
	_add_parse(UINT32, max_submit_jobs, "max/jobs/total"),
	_add_parse(TRES_LIST, max_tres_mins_pj, "max/tres/minutes/per/job"),
	/* skipping max_tres_mins_ctld (not packed) */
	_add_parse(TRES_LIST, max_tres_run_mins, "max/tres/minutes/total"),
	/* skipping max_tres_mins_ctld (not packed) */
	_add_parse(TRES_LIST, max_tres_pj, "max/tres/per/job"),
	/* skipping max_tres_ctld (not packed) */
	_add_parse(TRES_LIST, max_tres_pn, "max/tres/per/node"),
	/* skipping max_tres_pn_ctld */
	_add_parse(UINT32, max_wall_pj, "max/jobs/per/wall_clock"),
- 
slurmdb_qos_rec_t
--
NEWS                                       |  4 ++
doc/html/rest_release_notes.shtml          | 51 ++++++++++++++++++++++
src/plugins/openapi/dbv0.0.37/openapi.json | 40 ++++++++++++++++-
src/plugins/openapi/dbv0.0.37/parse.c      | 12 +++--
4 files changed, 101 insertions(+), 6 deletions(-)

Lines 8-13 documents those changes that are of interest to users and administrators. Link Here

(-)a/NEWS (+4 lines)
8	issue talking correctly to the DBD.	8	issue talking correctly to the DBD.
9	-- openapi/dbv0.0.37 - Add several missing fields in "dbv0.0.37_association"	9	-- openapi/dbv0.0.37 - Add several missing fields in "dbv0.0.37_association"
10	schema. Moved misnamed 'max/tres/total" to 'max/tres/group/total'.	10	schema. Moved misnamed 'max/tres/total" to 'max/tres/group/total'.
		11	-- openapi/dbv0.0.37 - Add several missing fields in "dbv0.0.37_qos" schema.
		12	Moved misnamed 'limits/max/jobs/per/user" to
		13	'limits/max/jobs/active/per/user'. Moved misnamed
		14	'limits/max/jobs/per/account" to 'limits/max/jobs/active/per/account'.
11		15
12	* Changes in Slurm 21.08.3	16	* Changes in Slurm 21.08.3
13	==========================	17	==========================




</tr>
</table>

<h4>Moved QOS field</h4>
<table class="tchange">
<tr class="trchange">
	<td class="tdfield">previous path</td>
	<td class="tdchange">
			.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.per.properties.user
	</td>
</tr>
<tr class="trchange">
	<td class="tdfield">new path</td>
	<td class="tdchange">
			.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.active.properties.per.properties.user
	</td>
</tr>
</table>

<h4>Moved QOS field</h4>
<table class="tchange">
<tr class="trchange">
	<td class="tdfield">previous path</td>
	<td class="tdchange">
			.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.per.properties.account
	</td>
</tr>
<tr class="trchange">
	<td class="tdfield">new path</td>
	<td class="tdchange">
			.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.active.properties.per.properties.account
	</td>
</tr>
</table>

<h4>Add QOS fields</h4>
<table class="tchange">
<tr class="trchange">
	<td class="tdfield">new fields</td>
	<td class="tdchange" colspan=2>
		<ul>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.factor</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.active.properties.accruing</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.active.properties.per.properties.account</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.active.properties.per.properties.user</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.active.properties.total</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.per.properties.account</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.per.properties.user</li>
			<li>.components.schemas."dbv0.0.37_qos".properties.limits.properties.max.properties.jobs.properties.total</li>
		</ul>
	</td>
</tr>
</table>

<h3>openapi/dbv0.0.37 (src/plugins/openapi/dbv0.0.37/openapi.json)</h3>

<h4>Correct placement of step TRES</h4>

Lines 2234-2239 Link Here

(-)a/src/plugins/openapi/dbv0.0.37/openapi.json (-2 / +38 lines)
2234	"type": "object",	2234	"type": "object",
2235	"description": "Assigned limits",	2235	"description": "Assigned limits",
2236	"properties": {	2236	"properties": {
		2237	"factor": {
		2238	"type": "number",
		2239	"description": "factor to apply to TRES count for associations using this QOS"
		2240	},
2237	"max": {	2241	"max": {
2238	"type": "object",	2242	"type": "object",
2239	"description": "Limits on max settings",	2243	"description": "Limits on max settings",
Lines 2262-2280 Link Here
2262	"type": "object",	2266	"type": "object",
2263	"description": "Limits on jobs settings",	2267	"description": "Limits on jobs settings",
2264	"properties": {	2268	"properties": {
		2269	"active": {
		2270	"type": "object",
		2271	"description": "Max active jobs limits",
		2272	"properties": {
		2273	"accruing": {
		2274	"type": "integer",
		2275	"description": "Max active job accruing priority"
		2276	},
		2277	"total": {
		2278	"type": "integer",
		2279	"description": "Max active job total submitted"
		2280	},
		2281	"per": {
		2282	"type": "object",
		2283	"description": "Max active jobs per settings",
		2284	"properties": {
		2285	"user": {
		2286	"type": "integer",
		2287	"description": "Max active jobs per user"
		2288	},
		2289	"account": {
		2290	"type": "integer",
		2291	"description": "Max active jobs per account"
		2292	}
		2293	}
		2294	}
		2295	}
		2296	},
2265	"per": {	2297	"per": {
2266	"type": "object",	2298	"type": "object",
2267	"description": "Limits on jobs per settings",	2299	"description": "Limits on jobs per settings",
2268	"properties": {	2300	"properties": {
2269	"account": {	2301	"account": {
2270	"type": "integer",	2302	"type": "integer",
2271	"description": "Max jobs per account"	2303	"description": "Max jobs submitted per account"
2272	},	2304	},
2273	"user": {	2305	"user": {
2274	"type": "integer",	2306	"type": "integer",
2275	"description": "Max jobs per user"	2307	"description": "max jobs submitted per user"
2276	}	2308	}
2277	}	2309	}
		2310	},
		2311	"total": {
		2312	"type": "integer",
		2313	"description": "Max jobs submitted to this QOS"
2278	}	2314	}
2279	}	2315	}
2280	},	2316	},




			 "flags"),
	_add_parse(UINT32, id, "id"),
	_add_parse(UINT32, grace_time, "limits/grace_time"),
	_add_parse(UINT32, grp_jobs_accrue, "limits/max/jobs/active/accruing"),
	_add_parse(UINT32, grp_jobs, "limits/max/jobs/active/total"),
	_add_parse(UINT32, grp_submit_jobs, "limits/max/jobs/total"),
	_add_parse(TRES_LIST, grp_tres, "limits/max/tres/total"),
	/* skipping grp_tres_ctld (not packed) */
	_add_parse(TRES_LIST, grp_tres_run_mins,

	/* skipping grp_tres_run_mins_ctld (not packed) */
	_add_parse_req(STRING, name, "name"),
	_add_parse(UINT32, grp_wall, "limits/max/wall_clock/per/qos"),
	_add_parse(FLOAT64, limit_factor, "limits/factor"),
	_add_parse(UINT32, max_jobs_pa, "limits/max/jobs/active/per/account"),
	_add_parse(UINT32, max_jobs_pu, "limits/max/jobs/active/per/user"),
	_add_parse(UINT32, max_jobs_accrue_pa,
		   "limits/max/accruing/per/account"),
	_add_parse(UINT32, max_jobs_accrue_pu, "limits/max/accruing/per/user"),
	_add_parse(UINT32, max_submit_jobs_pa, "limits/max/jobs/per/account"),
	_add_parse(UINT32, max_submit_jobs_pu, "limits/max/jobs/per/user"),
	_add_parse(TRES_LIST, max_tres_mins_pj,
		   "limits/max/tres/minutes/per/job"),
	/* skipping max_tres_mins_pj_ctld (not packed) */
- 

Return to ticket 12796

Lines 57-62 paths in a single quote string to avoid shell replacements.</p> Link Here

(-)a/doc/html/rest_release_notes.shtml (+34 lines)
57	</tr>	57	</tr>
58	</table>	58	</table>
59		59
		60	<h4>Move association field</h4>
		61	<table class="tchange">
		62	<tr class="trchange">
		63	<td class="tdfield">previous path</td>
		64	<td class="tdchange">
		65	.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.total
		66	</td>
		67	</tr>
		68	<tr class="trchange">
		69	<td class="tdfield">new path</td>
		70	<td class="tdchange">
		71	.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.total
		72	</td>
		73	</tr>
		74	</table>
		75
		76	<h4>Add association fields</h4>
		77	<table class="tchange">
		78	<tr class="trchange">
		79	<td class="tdfield">new fields</td>
		80	<td class="tdchange" colspan=2>
		81	<ul>
		82	<li>.components.schemas."dbv0.0.37_association".properties.is_default</li>
		83	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.active</li>
		84	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.accruing</li>
		85	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.total</li>
		86	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.active</li>
		87	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.minutes</li>
		88	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.group.properties.total</li>
		89	</ul>
		90	</td>
		91	</tr>
		92	</table>
		93
60	<h3>openapi/dbv0.0.37 (src/plugins/openapi/dbv0.0.37/openapi.json)</h3>	94	<h3>openapi/dbv0.0.37 (src/plugins/openapi/dbv0.0.37/openapi.json)</h3>
61		95
62	<h4>Correct placement of step TRES</h4>	96	<h4>Correct placement of step TRES</h4>

Lines 228-242 static const parser_t parse_assoc[] = { Link Here

(-)a/src/plugins/openapi/dbv0.0.37/parse.c (-7 / +16 lines)
228	_add_parse(UINT32, grp_jobs, "max/jobs/per/count"),	228	_add_parse(UINT32, grp_jobs, "max/jobs/per/count"),
229	_add_parse(UINT32, grp_jobs_accrue, "max/jobs/per/accruing"),	229	_add_parse(UINT32, grp_jobs_accrue, "max/jobs/per/accruing"),
230	_add_parse(UINT32, grp_submit_jobs, "max/jobs/per/submitted"),	230	_add_parse(UINT32, grp_submit_jobs, "max/jobs/per/submitted"),
231	_add_parse(TRES_LIST, grp_tres, "max/tres/total"),	231	_add_parse(TRES_LIST, grp_tres, "max/tres/group/total"),
232	/* skipping gres_tres_ctld (not packed) */	232	/* skipping gres_tres_ctld (not packed) */
233	_add_parse(TRES_LIST, max_tres_mins_pj, "max/tres/minutes/per/job"),	233	_add_parse(TRES_LIST, grp_tres_mins, "max/tres/group/minutes"),
234	/* skipping max_tres_mins_ctld */	234	/* skipping grp_tres_mins_ctld (not packed) */
235	_add_parse(TRES_LIST, max_tres_run_mins, "max/tres/minutes/total"),	235	_add_parse(TRES_LIST, grp_tres_run_mins, "max/tres/group/active"),
236	/* skipping grp_tres_run_mins_ctld (not packed) */	236	/* skipping grp_tres_run_mins_ctld (not packed) */
		237	/* skipping max_tres_mins_ctld */
237	_add_parse(UINT32, grp_wall, "max/per/account/wall_clock"),	238	_add_parse(UINT32, grp_wall, "max/per/account/wall_clock"),
		239	/* skipping id */
		240	_add_parse(UINT16, is_def, "is_default"),
		241	/* skipping lft */
		242	_add_parse(UINT32, max_jobs, "max/jobs/active"),
		243	_add_parse(UINT32, max_jobs_accrue, "max/jobs/accruing"),
		244	_add_parse(UINT32, max_submit_jobs, "max/jobs/total"),
		245	_add_parse(TRES_LIST, max_tres_mins_pj, "max/tres/minutes/per/job"),
		246	/* skipping max_tres_mins_ctld (not packed) */
		247	_add_parse(TRES_LIST, max_tres_run_mins, "max/tres/minutes/total"),
		248	/* skipping max_tres_mins_ctld (not packed) */
238	_add_parse(TRES_LIST, max_tres_pj, "max/tres/per/job"),	249	_add_parse(TRES_LIST, max_tres_pj, "max/tres/per/job"),
239	/* skipping max_tres_ctld */	250	/* skipping max_tres_ctld (not packed) */
240	_add_parse(TRES_LIST, max_tres_pn, "max/tres/per/node"),	251	_add_parse(TRES_LIST, max_tres_pn, "max/tres/per/node"),
241	/* skipping max_tres_pn_ctld */	252	/* skipping max_tres_pn_ctld */
242	_add_parse(UINT32, max_wall_pj, "max/jobs/per/wall_clock"),	253	_add_parse(UINT32, max_wall_pj, "max/jobs/per/wall_clock"),
243	-
244	slurmdb_qos_rec_t	254	slurmdb_qos_rec_t
245	--
246	NEWS \| 4 ++	255	NEWS \| 4 ++
247	doc/html/rest_release_notes.shtml \| 51 ++++++++++++++++++++++	256	doc/html/rest_release_notes.shtml \| 51 ++++++++++++++++++++++
248	src/plugins/openapi/dbv0.0.37/openapi.json \| 40 ++++++++++++++++-	257	src/plugins/openapi/dbv0.0.37/openapi.json \| 40 ++++++++++++++++-
249	src/plugins/openapi/dbv0.0.37/parse.c \| 12 +++--	258	src/plugins/openapi/dbv0.0.37/parse.c \| 12 +++--
250	4 files changed, 101 insertions(+), 6 deletions(-)	259	4 files changed, 101 insertions(+), 6 deletions(-)

Lines 484-491 static const parser_t parse_qos[] = { Link Here

(-)a/src/plugins/openapi/dbv0.0.37/parse.c (-5 / +8 lines)
484	"flags"),	484	"flags"),
485	_add_parse(UINT32, id, "id"),	485	_add_parse(UINT32, id, "id"),
486	_add_parse(UINT32, grace_time, "limits/grace_time"),	486	_add_parse(UINT32, grace_time, "limits/grace_time"),
487	_add_parse(UINT32, grp_jobs_accrue, "limits/max/active_jobs/accruing"),	487	_add_parse(UINT32, grp_jobs_accrue, "limits/max/jobs/active/accruing"),
488	_add_parse(UINT32, grp_jobs, "limits/max/active_jobs/count"),	488	_add_parse(UINT32, grp_jobs, "limits/max/jobs/active/total"),
		489	_add_parse(UINT32, grp_submit_jobs, "limits/max/jobs/total"),
489	_add_parse(TRES_LIST, grp_tres, "limits/max/tres/total"),	490	_add_parse(TRES_LIST, grp_tres, "limits/max/tres/total"),
490	/* skipping grp_tres_ctld (not packed) */	491	/* skipping grp_tres_ctld (not packed) */
491	_add_parse(TRES_LIST, grp_tres_run_mins,	492	_add_parse(TRES_LIST, grp_tres_run_mins,
Lines 493-503 static const parser_t parse_qos[] = { Link Here
493	/* skipping grp_tres_run_mins_ctld (not packed) */	494	/* skipping grp_tres_run_mins_ctld (not packed) */
494	_add_parse_req(STRING, name, "name"),	495	_add_parse_req(STRING, name, "name"),
495	_add_parse(UINT32, grp_wall, "limits/max/wall_clock/per/qos"),	496	_add_parse(UINT32, grp_wall, "limits/max/wall_clock/per/qos"),
496	_add_parse(UINT32, max_jobs_pa, "limits/max/jobs/per/account"),	497	_add_parse(FLOAT64, limit_factor, "limits/factor"),
497	_add_parse(UINT32, max_jobs_pu, "limits/max/jobs/per/user"),	498	_add_parse(UINT32, max_jobs_pa, "limits/max/jobs/active/per/account"),
		499	_add_parse(UINT32, max_jobs_pu, "limits/max/jobs/active/per/user"),
498	_add_parse(UINT32, max_jobs_accrue_pa,	500	_add_parse(UINT32, max_jobs_accrue_pa,
499	"limits/max/accruing/per/account"),	501	"limits/max/accruing/per/account"),
500	_add_parse(UINT32, max_jobs_accrue_pu, "limits/max/accruing/per/user"),	502	_add_parse(UINT32, max_jobs_accrue_pu, "limits/max/accruing/per/user"),
		503	_add_parse(UINT32, max_submit_jobs_pa, "limits/max/jobs/per/account"),
		504	_add_parse(UINT32, max_submit_jobs_pu, "limits/max/jobs/per/user"),
501	_add_parse(TRES_LIST, max_tres_mins_pj,	505	_add_parse(TRES_LIST, max_tres_mins_pj,
502	"limits/max/tres/minutes/per/job"),	506	"limits/max/tres/minutes/per/job"),
503	/* skipping max_tres_mins_pj_ctld (not packed) */	507	/* skipping max_tres_mins_pj_ctld (not packed) */
504	-