Attachment #22064 for ticket #12796

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

(-)a/NEWS (+1 lines)
66	as the resulting RPC generated can exceed internal limits and won't be	66	as the resulting RPC generated can exceed internal limits and won't be
67	sent, preventing further communication with SlurmDBD.	67	sent, preventing further communication with SlurmDBD.
68	This issue is indicated by "error: Invalid msg_size" in your log files.	68	This issue is indicated by "error: Invalid msg_size" in your log files.
		69	-- openapi/dbv0.0.37 - Add several missing fields in associations response.
69		70
70	* Changes in Slurm 21.08.2	71	* Changes in Slurm 21.08.2
71	==========================	72	==========================




</tr>
</table>

<h4>Add association fields</h4>
<table class="tchange">
<tr class="trchange">
	<td class="tdfield">New field</td>
	<td class="tdchange">
		<ul>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.per.properties.accruing</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.minutes.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.active.properties.minutes.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.is_default</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.accrue.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.active.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.accrue.properties.per.properties.total</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.per.properties.minutes.properties.per.properties.job</li>
			<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.per.properties.minutes.properties.per.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>




                "type": "object",
                "description": "Max jobs settings",
                "properties": {
                  "active": {
                    "type": "object",
                    "description": "max jobs active per settings",
                    "properties": {
                      "per": {
                        "type": "object",
                        "description": "max jobs active per settings",
                        "properties": {
                          "job": {
                            "type": "integer",
                            "description": "Max active total jobs"
                          }
                        }
                      }
                    }
                  },
                  "per": {
                    "type": "object",
                    "description": "Max jobs per settings",

                      "wall_clock": {
                        "type": "integer",
                        "description": "Max wallclock per job"
                      },
                      "accruing": {
                        "type": "integer",
                        "description": "Max job accruing priority"
                      },
                      "total": {
                        "type": "integer",
                        "description": "Max job total"
                      }
                    }
                  }

                "type": "object",
                "description": "Max TRES settings",
                "properties": {
                  "accrue": {
                    "type": "object",
                    "description": "Max TRES accruing per settings",
                    "properties": {
                      "per": {
                        "type": "object",
                        "properties": {
                          "total": {
                            "$ref": "#/components/schemas/dbv0.0.37_tres_list"
                          }
                        }
                      }
                    }
                  },
                  "per": {
                    "type": "object",
                    "description": "Max TRES per settings",

                        "properties": {
                          "job": {
                            "$ref": "#/components/schemas/dbv0.0.37_tres_list"
                          },
                          "total": {
                            "$ref": "#/components/schemas/dbv0.0.37_tres_list"
                          }
                        }
                      },

                        "$ref": "#/components/schemas/dbv0.0.37_tres_list"
                      }
                    }
                  },
                  "active": {
                    "type": "object",
                    "description": "Max TRES active settings at any one time",
                    "properties": {
                      "minutes": {
                        "type": "object",
                        "description": "Max TRES active minutes per settings",
                        "properties": {
                          "per": {
                            "type": "object",
                            "description": "Max TRES active minutes per settings per",
                            "properties": {
                              "total": {
                                "$ref": "#/components/schemas/dbv0.0.37_tres_list"
                              }
                            }
                          }
                        }
                      }
                    }
                  }
                }
              }
            }
          },
          "is_default": {
            "type": "integer",
            "description": "is default association"
          },
          "min": {
            "type": "object",
            "description": "Min settings",




	/* skip lft */
	_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/total"),
	_add_parse(TRES_LIST, grp_tres, "max/tres/total"),
	/* skipping gres_tres_ctld  (not packed) */
	_add_parse(TRES_LIST, grp_tres_mins, "max/tres/minutes/per/total"),
	/* skipping grp_tres_mins_ctld (not packed) */
	_add_parse(TRES_LIST, grp_tres_run_mins,
		   "max/tres/active/minutes/per/total"),
	/* 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/per/total"),
	_add_parse(UINT32, max_jobs_accrue, "max/accrue/per/total"),
	_add_parse(UINT32, max_submit_jobs, "max/jobs/per/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/per/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"),
- 

Return to ticket 12796

Lines 1999-2004 Link Here

(-)a/src/plugins/openapi/dbv0.0.37/openapi.json (+66 lines)
1999	"type": "object",	1999	"type": "object",
2000	"description": "Max jobs settings",	2000	"description": "Max jobs settings",
2001	"properties": {	2001	"properties": {
		2002	"active": {
		2003	"type": "object",
		2004	"description": "max jobs active per settings",
		2005	"properties": {
		2006	"per": {
		2007	"type": "object",
		2008	"description": "max jobs active per settings",
		2009	"properties": {
		2010	"job": {
		2011	"type": "integer",
		2012	"description": "Max active total jobs"
		2013	}
		2014	}
		2015	}
		2016	}
		2017	},
2002	"per": {	2018	"per": {
2003	"type": "object",	2019	"type": "object",
2004	"description": "Max jobs per settings",	2020	"description": "Max jobs per settings",
Lines 2006-2011 Link Here
2006	"wall_clock": {	2022	"wall_clock": {
2007	"type": "integer",	2023	"type": "integer",
2008	"description": "Max wallclock per job"	2024	"description": "Max wallclock per job"
		2025	},
		2026	"accruing": {
		2027	"type": "integer",
		2028	"description": "Max job accruing priority"
		2029	},
		2030	"total": {
		2031	"type": "integer",
		2032	"description": "Max job total"
2009	}	2033	}
2010	}	2034	}
2011	}	2035	}
Lines 2031-2036 Link Here
2031	"type": "object",	2055	"type": "object",
2032	"description": "Max TRES settings",	2056	"description": "Max TRES settings",
2033	"properties": {	2057	"properties": {
		2058	"accrue": {
		2059	"type": "object",
		2060	"description": "Max TRES accruing per settings",
		2061	"properties": {
		2062	"per": {
		2063	"type": "object",
		2064	"properties": {
		2065	"total": {
		2066	"$ref": "#/components/schemas/dbv0.0.37_tres_list"
		2067	}
		2068	}
		2069	}
		2070	}
		2071	},
2034	"per": {	2072	"per": {
2035	"type": "object",	2073	"type": "object",
2036	"description": "Max TRES per settings",	2074	"description": "Max TRES per settings",
Lines 2056-2061 Link Here
2056	"properties": {	2094	"properties": {
2057	"job": {	2095	"job": {
2058	"$ref": "#/components/schemas/dbv0.0.37_tres_list"	2096	"$ref": "#/components/schemas/dbv0.0.37_tres_list"
		2097	},
		2098	"total": {
		2099	"$ref": "#/components/schemas/dbv0.0.37_tres_list"
2059	}	2100	}
2060	}	2101	}
2061	},	2102	},
Lines 2063-2073 Link Here
2063	"$ref": "#/components/schemas/dbv0.0.37_tres_list"	2104	"$ref": "#/components/schemas/dbv0.0.37_tres_list"
2064	}	2105	}
2065	}	2106	}
		2107	},
		2108	"active": {
		2109	"type": "object",
		2110	"description": "Max TRES active settings at any one time",
		2111	"properties": {
		2112	"minutes": {
		2113	"type": "object",
		2114	"description": "Max TRES active minutes per settings",
		2115	"properties": {
		2116	"per": {
		2117	"type": "object",
		2118	"description": "Max TRES active minutes per settings per",
		2119	"properties": {
		2120	"total": {
		2121	"$ref": "#/components/schemas/dbv0.0.37_tres_list"
		2122	}
		2123	}
		2124	}
		2125	}
		2126	}
		2127	}
2066	}	2128	}
2067	}	2129	}
2068	}	2130	}
2069	}	2131	}
2070	},	2132	},
		2133	"is_default": {
		2134	"type": "integer",
		2135	"description": "is default association"
		2136	},
2071	"min": {	2137	"min": {
2072	"type": "object",	2138	"type": "object",
2073	"description": "Min settings",	2139	"description": "Min settings",

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

(-)a/src/plugins/openapi/dbv0.0.37/parse.c (-6 / +17 lines)
227	/* skip lft */	227	/* skip lft */
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/total"),
231	_add_parse(TRES_LIST, grp_tres, "max/tres/total"),	231	_add_parse(TRES_LIST, grp_tres, "max/tres/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/minutes/per/total"),
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,
		236	"max/tres/active/minutes/per/total"),
236	/* skipping grp_tres_run_mins_ctld (not packed) */	237	/* skipping grp_tres_run_mins_ctld (not packed) */
		238	/* skipping max_tres_mins_ctld */
237	_add_parse(UINT32, grp_wall, "max/per/account/wall_clock"),	239	_add_parse(UINT32, grp_wall, "max/per/account/wall_clock"),
		240	/* skipping id */
		241	_add_parse(UINT16, is_def, "is_default"),
		242	/* skipping lft */
		243	_add_parse(UINT32, max_jobs, "max/jobs/active/per/total"),
		244	_add_parse(UINT32, max_jobs_accrue, "max/accrue/per/total"),
		245	_add_parse(UINT32, max_submit_jobs, "max/jobs/per/total"),
		246	_add_parse(TRES_LIST, max_tres_mins_pj, "max/tres/minutes/per/job"),
		247	/* skipping max_tres_mins_ctld (not packed) */
		248	_add_parse(TRES_LIST, max_tres_run_mins, "max/tres/minutes/per/total"),
		249	/* skipping max_tres_mins_ctld (not packed) */
238	_add_parse(TRES_LIST, max_tres_pj, "max/tres/per/job"),	250	_add_parse(TRES_LIST, max_tres_pj, "max/tres/per/job"),
239	/* skipping max_tres_ctld */	251	/* skipping max_tres_ctld (not packed) */
240	_add_parse(TRES_LIST, max_tres_pn, "max/tres/per/node"),	252	_add_parse(TRES_LIST, max_tres_pn, "max/tres/per/node"),
241	/* skipping max_tres_pn_ctld */	253	/* skipping max_tres_pn_ctld */
242	_add_parse(UINT32, max_wall_pj, "max/jobs/per/wall_clock"),	254	_add_parse(UINT32, max_wall_pj, "max/jobs/per/wall_clock"),
243	-

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

(-)a/doc/html/rest_release_notes.shtml (+23 lines)
57	</tr>	57	</tr>
58	</table>	58	</table>
59		59
		60	<h4>Add association fields</h4>
		61	<table class="tchange">
		62	<tr class="trchange">
		63	<td class="tdfield">New field</td>
		64	<td class="tdchange">
		65	<ul>
		66	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.per.properties.accruing</li>
		67	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.per.properties.total</li>
		68	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.minutes.properties.per.properties.total</li>
		69	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.active.properties.minutes.properties.per.properties.total</li>
		70	<li>.components.schemas."dbv0.0.37_association".properties.is_default</li>
		71	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.per.properties.total</li>
		72	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.accrue.properties.per.properties.total</li>
		73	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.jobs.properties.active.properties.per.properties.total</li>
		74	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.accrue.properties.per.properties.total</li>
		75	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.per.properties.minutes.properties.per.properties.job</li>
		76	<li>.components.schemas."dbv0.0.37_association".properties.max.properties.tres.properties.per.properties.minutes.properties.per.properties.total</li>
		77	</ul>
		78	</td>
		79	</tr>
		80	</table>
		81
		82
60	<h3>openapi/dbv0.0.37 (src/plugins/openapi/dbv0.0.37/openapi.json)</h3>	83	<h3>openapi/dbv0.0.37 (src/plugins/openapi/dbv0.0.37/openapi.json)</h3>
61		84
62	<h4>Correct placement of step TRES</h4>	85	<h4>Correct placement of step TRES</h4>