Fix insert family submit-num increment #3236
Conversation
320c365 to
117a0ec
Compare
| @@ -134,7 +134,7 @@ def insert_tasks(self, items, stopcp, no_check=False): | |||
| continue | |||
| for taskdef in taskdefs: | |||
| task_items[(taskdef.name, point_str)] = taskdef | |||
| select_args.append((name_str, point_str)) | |||
| select_args.append((taskdef.name, point_str)) | |||
There was a problem hiding this comment.
One line bug fix here!
| itask = self.add_to_runahead_pool(TaskProxy( | ||
| taskdef, point, stop_point=stop_point, submit_num=submit_num)) | ||
| if itask: | ||
| LOG.info("[%s] -inserted", itask) | ||
| LOG.info("[%s] -submit-num=%02d, inserted", itask, submit_num) |
There was a problem hiding this comment.
Better logging...
117a0ec to
dd7210d
Compare
|
Travis failed (before the sensitive tests job). |
And it is a real error! An unexpected consequence of the change. Looks like the database query will end up with over 1000 where clauses in this test. (It passes in my environment, but Travis CI's environment may be more restrictive?) I guess I'll have to change tactic. |
|
Code and test both look good to me, Travis happy too. +1 Only didn't approve because I kicked Travis three times already (one was a full restart), and it keeps refusing to pass this build 😠 |
|
@kinow Thanks. I am taking a look at the failed Travis CI tests. The are passing in my desktop environment and I am sure they will pass on kicking. I'll move them to live with the flaky tests (or fix them if possible) in a separate PR. |
f147703 to
d7b50bd
Compare
|
(TB will likely fail in the same way as what I am trying to fix in #3244 . I believe there is a change to Travis CI on how it handles |
On insert of a family with tasks that had submitted jobs before, the submit numbers of the tasks were not incremented. This changes fixes the issue.
Instead of building a single statement with multiple WHERE clauses, execute statement multiple times to avoid issues when there are too many WHERE clauses. This may be less efficient, but is much safer.
d7b50bd to
18bd977
Compare
|
(All checks passed!) |
On insert of a family with tasks that had submitted jobs before, the submit
numbers of the tasks were not incremented. This changes fixes the issue.
These changes close #3210.
Requirements check-list
CONTRIBUTING.mdand added my name as a Code Contributor.CHANGES.md.