lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(lib): a malformed select in a resreq fails the parse instead of being dropped (bug-1887)

Browse source 
The primary_resreq action ignored parse_resreq_primary()'s result, so a
primary whose select (or rusage) clause failed to parse was accepted
without that clause: select[type==] or select[mem>] matched every host.
A malformed clause now fails the whole resreq, and parse_resreq() returns
the clause's own message.

A select naming an unregistered resource is still dropped, not an
error: parse_select() reports it as -ENOENT (new select_context_t
.unknown_resource) and the action lets it pass, because jobs rely on it
-- the scheduler's own "type == any" default among them when no "type"
resource is registered (making it fatal failed 36 scheduler suites).

Test: test_resreq_primary_select_error_fails_parse RED before (all
accepted), GREEN after.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Rongsong Shen 2026-09-29 10:26:35 +00:00
parent 077b1213d3
commit b5712c053d
Signed by untrusted user: rshen
GPG key ID: 80533536B0EB651C
6 changed files with 117 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/resreq.c
View file

@ -325,7 +325,9 @@ static int parse_select(xce_primary_resreq_t* primary, char* selectString,
*errmsg = strdup(ctx.errmsg);
else
get_parse_errmsg(errmsg, selectString, ctx.err_pos);
rc = -EINVAL;
/* bug-1887: -ENOENT tells a select naming an unregistered resource
* apart from a malformed one (-EINVAL) */
rc = ctx.unknown_resource ? -ENOENT : -EINVAL;
goto cleanup_parser;
}
@ -535,7 +537,14 @@ int parse_resreq(xce_resreq_t* resreq, char* data, var resmgr, char** errmsg)
xce_resreq_parse(p, NULL);
if (ctx.has_error) {
get_parse_errmsg(errmsg, ctx.input, ctx.err_pos);
/* bug-1887: a primary's own message (select/rusage) names the
* failing clause; otherwise report the grammar error position */
if (ctx.errmsg != NULL) {
*errmsg = ctx.errmsg;
ctx.errmsg = NULL;
} else {
get_parse_errmsg(errmsg, ctx.input, ctx.err_pos);
}
rc = -EINVAL;
/* FIXME: need to freeup partial data in resreqs */
}