Skip to content

Server: sched/validator: DON'T set assimilate_state by the validator. #5707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Server: sched/validator: DON'T set assimilate_state by the validator. #5707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions db/boinc_db.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2032,8 +2032,9 @@ int DB_VALIDATOR_ITEM_SET::update_workunit(WORKUNIT& wu) {
char query[MAX_QUERY_LEN];

sprintf(query,
"update workunit set need_validate=0, error_mask=%d, "
"assimilate_state=%d, transition_time=%d, "
"update workunit set need_validate=0, "
"error_mask=error_mask|%d, "
"transition_time=%d, "
"target_nresults=%d, "
"canonical_resultid=%lu, canonical_credit=%.15e "
"where id=%lu",
Expand Down
6 changes: 5 additions & 1 deletion sched/validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,11 @@ int handle_wu(
);
wu.canonical_resultid = canonicalid;
wu.canonical_credit = credit;
wu.assimilate_state = ASSIMILATE_READY;

// DON'T modify assimilate_state here, under bad conditions the
// assimilator may have already started to work on this WU.
// Instead, let the transitioner decide what to do with it.
transition_time = IMMEDIATE;

// don't need to send any more results
//
Expand Down